Backport reference count and threadsafe fixes from the 2.8 branch.pygtk-2-6

        * gobject/pygobject.c: (pygobject_new_with_interfaces):
        Backport reference count and threadsafe fixes from the 2.8 branch.

2 files changed, 9 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index f406f88b..6c7637ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-28  Johan Dahlin  <johan@gnome.org>
+
+	* gobject/pygobject.c: (pygobject_new_with_interfaces):
+	Backport reference count and threadsafe fixes from the 2.8 branch.
+
 2005-09-06  Johan Dahlin  <jdahlin@async.com.br>
 
 	* configure.in: Post release version bump
diff --git a/gobject/pygobject.c b/gobject/pygobject.c
index 7379a927..3a5fbc28 100644
--- a/gobject/pygobject.c
+++ b/gobject/pygobject.c
@@ -192,6 +192,8 @@ pygobject_new_with_interfaces(GType gtype)
     PyObject *modules, *module;
     gchar *type_name, *mod_name, *gtype_name;
 
+    state = pyg_gil_state_ensure();
+
     interfaces = g_type_interfaces (gtype, &n_interfaces);
     bases = PyTuple_New(n_interfaces+1);
     
@@ -200,6 +202,7 @@ pygobject_new_with_interfaces(GType gtype)
     py_parent_type = pygobject_lookup_class(parent_type);
 
     /* We will always put the parent at the first position in bases */
+    Py_INCREF(py_parent_type); /* PyTuple_SetItem steals a reference */
     PyTuple_SetItem(bases, 0, (PyObject*)py_parent_type);
 
     /* And traverse interfaces */
@@ -207,6 +210,7 @@ pygobject_new_with_interfaces(GType gtype)
 	for (i = 0; i < n_interfaces; i++) {
 	    interface_type = interfaces[i];
 	    py_interface_type = pygobject_lookup_class(interface_type);
+            Py_INCREF(py_interface_type); /* PyTuple_SetItem steals a reference */
 	    PyTuple_SetItem(bases, i+1, (PyObject*)py_interface_type);
 	}
 	
@@ -245,8 +249,6 @@ pygobject_new_with_interfaces(GType gtype)
 	type_name = g_strconcat(mod_name, ".", gtype_name, NULL);
     }
 
-    state = pyg_gil_state_ensure();
-
     type = (PyTypeObject*)PyObject_CallFunction((PyObject*)&PyType_Type, "sOO",
 						type_name, bases, dict);
     g_free(type_name);