summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--glib/pygmainloop.c5
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index ded2d7d..2e190a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2008-08-28 Paul Pogonyshev <pogonyshev@gmx.net>
+ Bug 549351 – an unitialized variable in PyGLib
+
+ * glib/pygmainloop.c (pyg_main_loop_init): Initialize
+ `is_running'.
+
+2008-08-28 Paul Pogonyshev <pogonyshev@gmx.net>
+
Bug 547633 – cannot create new threads when pygtk is used
* glib/pyglib.c (pyglib_notify_on_enabling_threads): New function.
diff --git a/glib/pygmainloop.c b/glib/pygmainloop.c
index e966962..50459a0 100644
--- a/glib/pygmainloop.c
+++ b/glib/pygmainloop.c
@@ -232,10 +232,9 @@ PYGLIB_DEFINE_TYPE("glib.MainLoop", PyGMainLoop_Type, PyGMainLoop)
static int
pyg_main_loop_init(PyGMainLoop *self, PyObject *args, PyObject *kwargs)
{
-
static char *kwlist[] = { "context", "is_running", NULL };
PyObject *py_context = Py_None;
- int is_running;
+ int is_running = 0;
GMainContext *context;
if (!PyArg_ParseTupleAndKeywords(args, kwargs,
@@ -246,7 +245,7 @@ pyg_main_loop_init(PyGMainLoop *self, PyObject *args, PyObject *kwargs)
if (!PyObject_TypeCheck(py_context, &PyGMainContext_Type) &&
py_context != Py_None) {
PyErr_SetString(PyExc_TypeError,
- "context must be a glib.GMainContext or None");
+ "context must be a glib.MainContext or None");
return -1;
}