Use GIL state instead of block/unblock. Fixes crasher found by Ole Andre

        * gobject/pygiochannel.c: (pyg_iowatch_marshal):
        Use GIL state instead of block/unblock. Fixes crasher found
        by Ole Andre Valda Ravnås.

2 files changed, 11 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 1c376b06..a9832104 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-09  Johan Dahlin  <johan@gnome.org>
+
+	* gobject/pygiochannel.c: (pyg_iowatch_marshal):
+	Use GIL state instead of block/unblock. Fixes crasher found
+	by Ole Andre Valda Ravnås.
+
 2005-10-04  Johan Dahlin  <jdahlin@async.com.br>
 
 	* configure.in: post release version bump
diff --git a/gobject/pygiochannel.c b/gobject/pygiochannel.c
index ad56a6fb..bb3be9be 100644
--- a/gobject/pygiochannel.c
+++ b/gobject/pygiochannel.c
@@ -435,12 +435,14 @@ pyg_iowatch_marshal(GIOChannel *source,
     PyObject *ret;
     gboolean res;
     PyGIOWatchData *data = (PyGIOWatchData *) user_data;
+    PyGILState_STATE state;
 
     g_return_val_if_fail(user_data != NULL, FALSE);
     g_return_val_if_fail(((PyGIOChannel *) data->iochannel)->channel == source,
                          FALSE);
 
-    pyg_block_threads();
+    state = pyg_gil_state_ensure();
+
     if (data->user_data)
         ret = PyObject_CallFunction(data->callback, "OiO", data->iochannel,
                                     condition, data->user_data);
@@ -455,7 +457,8 @@ pyg_iowatch_marshal(GIOChannel *source,
 	res = PyObject_IsTrue(ret);
 	Py_DECREF(ret);
     }
-    pyg_unblock_threads();
+    pyg_gil_state_release(state);
+
     return res;
 }