Fix for 367607 : Remove deprecated GTK+ symbols - Deprecated *_unref symbols replaced with g_object_unref

(bzr r11139)

9 files changed, 15 insertions, 15 deletions

diff --git a/src/display/sodipodi-ctrl.cpp b/src/display/sodipodi-ctrl.cpp
index 1380b491a..a82aa8622 100644
--- a/src/display/sodipodi-ctrl.cpp
+++ b/src/display/sodipodi-ctrl.cpp
@@ -205,7 +205,7 @@ sp_ctrl_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
                 ctrl->pixbuf = pixbuf;
             } else {
                 ctrl->pixbuf = gdk_pixbuf_add_alpha (pixbuf, FALSE, 0, 0, 0);
-                gdk_pixbuf_unref (pixbuf);
+                g_object_unref (pixbuf);
             }
             ctrl->build = FALSE;
             break;
diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp
index 11836baa2..e5be4f8a9 100644
--- a/src/display/sp-canvas.cpp
+++ b/src/display/sp-canvas.cpp
@@ -1100,7 +1100,7 @@ void SPCanvasGroup::remove(SPCanvasItem *item)
 
             // Unparent the child
             item->parent = NULL;
-            gtk_object_unref(GTK_OBJECT(item));
+            g_object_unref(item);
 
             // Remove it from the list
             if (children == last) {
@@ -1242,7 +1242,7 @@ void SPCanvasImpl::destroy(GtkObject *object)
     SPCanvas *canvas = SP_CANVAS(object);
 
     if (canvas->root) {
-        gtk_object_unref (GTK_OBJECT (canvas->root));
+        g_object_unref (canvas->root);
         canvas->root = NULL;
     }
 
@@ -1487,7 +1487,7 @@ int SPCanvasImpl::emitEvent(SPCanvas *canvas, GdkEvent *event)
         gtk_object_ref (GTK_OBJECT (item));
         g_signal_emit (G_OBJECT (item), item_signals[ITEM_EVENT], 0, &ev, &finished);
         SPCanvasItem *parent = item->parent;
-        gtk_object_unref (GTK_OBJECT (item));
+        g_object_unref (item);
         item = parent;
     }
 
diff --git a/src/extension/internal/cairo-renderer.cpp b/src/extension/internal/cairo-renderer.cpp
index 61e943dba..09d69becb 100644
--- a/src/extension/internal/cairo-renderer.cpp
+++ b/src/extension/internal/cairo-renderer.cpp
@@ -507,7 +507,7 @@ static void sp_asbitmap_render(SPItem *item, CairoRenderContext *ctx)
         // TODO this is stupid - we just converted to pixbuf format when generating the bitmap!
         convert_pixbuf_normal_to_argb32(pb);
         ctx->renderImage(pb, t, item->style);
-        gdk_pixbuf_unref(pb);
+        g_object_unref(pb);
         pb = 0;
     }
     g_slist_free (items);
diff --git a/src/helper/pixbuf-ops.cpp b/src/helper/pixbuf-ops.cpp
index f980953dc..cae297e89 100644
--- a/src/helper/pixbuf-ops.cpp
+++ b/src/helper/pixbuf-ops.cpp
@@ -77,7 +77,7 @@ bool sp_export_jpg_file(SPDocument *doc, gchar const *filename,
     g_snprintf(c, 32, "%f", quality);
     gboolean saved = gdk_pixbuf_save (pixbuf, filename, "jpeg", NULL, "quality", c, NULL);
     g_free(c);
-    gdk_pixbuf_unref (pixbuf);
+    g_object_unref (pixbuf);
 
     return saved;
 }
diff --git a/src/helper/unit-menu.cpp b/src/helper/unit-menu.cpp
index ce64cabf4..ea1ddde5e 100644
--- a/src/helper/unit-menu.cpp
+++ b/src/helper/unit-menu.cpp
@@ -132,7 +132,7 @@ sp_unit_selector_finalize(GObject *object)
     }
 
     while (selector->adjustments) {
-        gtk_object_unref(GTK_OBJECT(selector->adjustments->data));
+        g_object_unref(selector->adjustments->data);
         selector->adjustments = g_slist_remove(selector->adjustments, selector->adjustments->data);
     }
 
@@ -341,7 +341,7 @@ sp_unit_selector_remove_adjustment(SPUnitSelector *us, GtkAdjustment *adj)
     g_return_if_fail(g_slist_find(us->adjustments, adj));
 
     us->adjustments = g_slist_remove(us->adjustments, adj);
-    gtk_object_unref(GTK_OBJECT(adj));
+    g_object_unref(adj);
 }
 
 gboolean
diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp
index d0fba0de5..7f3b14d58 100644
--- a/src/selection-chemistry.cpp
+++ b/src/selection-chemistry.cpp
@@ -2907,7 +2907,7 @@ void sp_selection_create_bitmap_copy(SPDesktop *desktop)
 
         // Clean up
         Inkscape::GC::release(repr);
-        gdk_pixbuf_unref(pb);
+        g_object_unref(pb);
 
         // Complete undoable transaction
         DocumentUndo::done(document, SP_VERB_SELECTION_CREATE_BITMAP,
diff --git a/src/sp-image.cpp b/src/sp-image.cpp
index df0d052dd..07885ff4d 100644
--- a/src/sp-image.cpp
+++ b/src/sp-image.cpp
@@ -657,7 +657,7 @@ static void sp_image_release( SPObject *object )
     }
 
     if (image->pixbuf) {
-        gdk_pixbuf_unref (image->pixbuf);
+        g_object_unref (image->pixbuf);
         image->pixbuf = NULL;
     }
 
@@ -815,7 +815,7 @@ static void sp_image_update( SPObject *object, SPCtx *ctx, unsigned int flags )
 
     if (flags & SP_IMAGE_HREF_MODIFIED_FLAG) {
         if (image->pixbuf) {
-            gdk_pixbuf_unref (image->pixbuf);
+            g_object_unref (image->pixbuf);
             image->pixbuf = NULL;
         }
         if ( image->pixPath ) {
@@ -1254,7 +1254,7 @@ static GdkPixbuf *sp_image_pixbuf_force_rgba( GdkPixbuf * pixbuf )
         result = pixbuf;
     } else {
         result = gdk_pixbuf_add_alpha(pixbuf, FALSE, 0, 0, 0);
-        gdk_pixbuf_unref(pixbuf);
+        g_object_unref(pixbuf);
     }
     return result;
 }
diff --git a/src/widgets/sp-color-slider.cpp b/src/widgets/sp-color-slider.cpp
index 5ec6d57df..047083b43 100644
--- a/src/widgets/sp-color-slider.cpp
+++ b/src/widgets/sp-color-slider.cpp
@@ -171,7 +171,7 @@ sp_color_slider_destroy (GtkObject *object)
 
 	if (slider->adjustment) {
 		g_signal_handlers_disconnect_matched (G_OBJECT (slider->adjustment), G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, slider);
-		gtk_object_unref (GTK_OBJECT (slider->adjustment));
+		g_object_unref (slider->adjustment);
 		slider->adjustment = NULL;
 	}
 
@@ -343,7 +343,7 @@ void sp_color_slider_set_adjustment(SPColorSlider *slider, GtkAdjustment *adjust
 	if (slider->adjustment != adjustment) {
 		if (slider->adjustment) {
 			g_signal_handlers_disconnect_matched (G_OBJECT (slider->adjustment), G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, slider);
-			gtk_object_unref (GTK_OBJECT (slider->adjustment));
+			g_object_unref (slider->adjustment);
 		}
 
 		slider->adjustment = adjustment;
diff --git a/src/widgets/sp-widget.cpp b/src/widgets/sp-widget.cpp
index aa4c85851..8645d90f7 100644
--- a/src/widgets/sp-widget.cpp
+++ b/src/widgets/sp-widget.cpp
@@ -234,7 +234,7 @@ sp_widget_new_global (Inkscape::Application *inkscape)
 	spw = (SPWidget*)g_object_new (SP_TYPE_WIDGET, NULL);
 
 	if (!sp_widget_construct_global (spw, inkscape)) {
-		gtk_object_unref (GTK_OBJECT (spw));
+	    g_object_unref (spw);
 		return NULL;
 	}