Remove deprecated GTK+ symbols

https://bugzilla.gnome.org/show_bug.cgi?id=605318

6 files changed, 22 insertions, 23 deletions

diff --git a/gtk/gdk-base.defs b/gtk/gdk-base.defs
index 0951e9a0..7f0eb679 100644
--- a/gtk/gdk-base.defs
+++ b/gtk/gdk-base.defs
@@ -2227,7 +2227,7 @@
 
 (define-method unref
   (of-object "GdkGC")
-  (c-name "gdk_gc_unref")
+  (c-name "g_object_unref")
   (return-type "none")
 )
 
diff --git a/gtk/gdk.override b/gtk/gdk.override
index db7ce2c9..8c3eb35e 100644
--- a/gtk/gdk.override
+++ b/gtk/gdk.override
@@ -208,8 +208,8 @@ _wrap_gdk_pixmap_create_from_xpm(PyObject *self, PyObject *args,
     ret = Py_BuildValue("(NN)",
                         pygobject_new((GObject *)pixmap),
                         pygobject_new((GObject *)mask));
-    gdk_pixmap_unref(pixmap);
-    gdk_bitmap_unref(mask);
+    g_object_unref(pixmap);
+    g_object_unref(mask);
     return ret;
 }
 %%
@@ -262,8 +262,8 @@ _wrap_gdk_pixmap_colormap_create_from_xpm(PyObject *self, PyObject *args,
     ret = Py_BuildValue("(NN)",
                         pygobject_new((GObject *)pixmap),
                         pygobject_new((GObject *)mask));
-    gdk_pixmap_unref(pixmap);
-    gdk_bitmap_unref(mask);
+    g_object_unref(pixmap);
+    g_object_unref(mask);
     return ret;
 }
 %%
@@ -314,8 +314,8 @@ _wrap_gdk_pixmap_create_from_xpm_d(PyObject *self, PyObject *args,
     ret = Py_BuildValue("(NN)",
                         pygobject_new((GObject *)pixmap),
                         pygobject_new((GObject *)mask));
-    gdk_pixmap_unref(pixmap);
-    gdk_bitmap_unref(mask);
+    g_object_unref(pixmap);
+    g_object_unref(mask);
     return ret;
 }
 %%
@@ -382,8 +382,8 @@ _wrap_gdk_pixmap_colormap_create_from_xpm_d(PyObject *self, PyObject *args,
     ret = Py_BuildValue("(NN)",
                         pygobject_new((GObject *)pixmap),
                         pygobject_new((GObject *)mask));
-    gdk_pixmap_unref(pixmap);
-    gdk_bitmap_unref(mask);
+    g_object_unref(pixmap);
+    g_object_unref(mask);
     return ret;
 }
 %%
diff --git a/gtk/gdkgc.override b/gtk/gdkgc.override
index 4724f41b..afa73fd7 100644
--- a/gtk/gdkgc.override
+++ b/gtk/gdkgc.override
@@ -277,7 +277,7 @@ _wrap_gdk_gc_new_with_values(PyGObject *self, PyObject *args, PyObject *kwargs)
     }
     gc = gdk_gc_new_with_values(GDK_DRAWABLE(self->obj), &values, mask);
     pygc = pygobject_new((GObject *)gc);
-    gdk_gc_unref(gc);
+    g_object_unref(gc);
     return pygc;
 }
 %%
diff --git a/gtk/gdkpixbuf.override b/gtk/gdkpixbuf.override
index 39341194..c894a0ec 100644
--- a/gtk/gdkpixbuf.override
+++ b/gtk/gdkpixbuf.override
@@ -40,7 +40,7 @@ _wrap_gdk_pixbuf_render_pixmap_and_mask(PyGObject *self, PyObject *args,
 
     if (pixmap) {
         pypixmap = pygobject_new((GObject *) pixmap);
-        gdk_pixmap_unref(pixmap);
+        g_object_unref(pixmap);
     } else {
         Py_INCREF(Py_None);
         pypixmap = Py_None;
diff --git a/gtk/gtk-types.c b/gtk/gtk-types.c
index a7e078bf..8e40df2f 100644
--- a/gtk/gtk-types.c
+++ b/gtk/gtk-types.c
@@ -45,7 +45,7 @@ PyGdkWindow_New(GdkWindow *win)
     if (self == NULL)
 	return NULL;
     self->obj = win;
-    gdk_window_ref(self->obj);
+    g_object_ref(self->obj);
     return (PyObject *)self;
 }
 #endif
@@ -387,10 +387,10 @@ static PyTypeObject PyGtkRcStyleHelper_Type = {
 static void
 PyGdkWindow_Dealloc(PyGdkWindow_Object *self)
 {
-    if (gdk_window_get_type(self->obj) == GDK_WINDOW_PIXMAP)
-	gdk_pixmap_unref(self->obj);
+    if (gdk_drawable_get_type(self->obj) == GDK_WINDOW_PIXMAP)
+	g_object_unref(self->obj);
     else
-	gdk_window_unref(self->obj);
+	g_object_unref(self->obj);
     PyObject_DEL(self);
 }
 
@@ -412,7 +412,7 @@ static PyObject *
 PyGdkWindow_Repr(PyGdkWindow_Object *self)
 {
     char buf[100];
-    if (gdk_window_get_type(self->obj) == GDK_WINDOW_PIXMAP)
+    if (gdk_drawable_get_type(self->obj) == GDK_WINDOW_PIXMAP)
 	sprintf(buf, "<GdkPixmap at %lx>", (long)PyGdkWindow_Get(self));
     else
 	sprintf(buf, "<GdkWindow at %lx>", (long)PyGdkWindow_Get(self));
@@ -535,7 +535,7 @@ PyGdkWindow_NewGC(PyGdkWindow_Object *self, PyObject *args, PyObject *kws)
 	return NULL;
     gc = gdk_gc_new_with_values(PyGdkWindow_Get(self), &values, mask);
     value = PyGdkGC_New(gc);
-    gdk_gc_unref(gc);
+    g_object_unref(gc);
     return value;
 }
 
@@ -794,11 +794,11 @@ PyGdkWindow_GetAttr(PyGdkWindow_Object *self, char *key)
 			     "height", "parent", "pointer", "pointer_state",
 			     "toplevel", "type", "width", "x", "xid", "y");
     if (!strcmp(key, "width")) {
-	gdk_window_get_size(win, &x, NULL);
+	gdk_drawable_get_size(win, &x, NULL);
 	return PyInt_FromLong(x);
     }
     if (!strcmp(key, "height")) {
-	gdk_window_get_size(win, NULL, &y);
+	gdk_drawable_get_size(win, NULL, &y);
 	return PyInt_FromLong(y);
     }
     if (!strcmp(key, "x")) {
@@ -810,7 +810,7 @@ PyGdkWindow_GetAttr(PyGdkWindow_Object *self, char *key)
 	return PyInt_FromLong(y);
     }
     if (!strcmp(key, "colormap"))
-	return PyGdkColormap_New(gdk_window_get_colormap(win));
+	return PyGdkColormap_New(gdk_drawable_get_colormap(win));
     if (!strcmp(key, "pointer")) {
 	gdk_window_get_pointer(win, &x, &y, NULL);
 	return Py_BuildValue("(ii)", x, y);
@@ -847,7 +847,7 @@ PyGdkWindow_GetAttr(PyGdkWindow_Object *self, char *key)
 	return ret;
     }
     if (!strcmp(key, "type"))
-	return PyInt_FromLong(gdk_window_get_type(win));
+	return PyInt_FromLong(gdk_drawable_get_type(win));
     if (!strcmp(key, "depth")) {
 	gdk_window_get_geometry(win, NULL, NULL, NULL, NULL, &x);
 	return PyInt_FromLong(x);
diff --git a/gtk/gtkmodule.c b/gtk/gtkmodule.c
index b27f94e6..ff6420c6 100644
--- a/gtk/gtkmodule.c
+++ b/gtk/gtkmodule.c
@@ -77,8 +77,7 @@ static void
 sink_gtkobject(GObject *object)
 {
     if (GTK_OBJECT_FLOATING(object)) {
-	g_object_ref(object);
-	gtk_object_sink(GTK_OBJECT(object));
+	g_object_ref_sink(object);
     }
 }