[f-spot] bgo #575019 – Remove deprecated GTK+ symbols in libeog and libfspot

[Ruben Vermeersch <rubenv src gnome org>]

commit d44d2b7f649d6e31f41c4e720be2b8cf2687a07f
Author: David Mazary <dmaz vt edu>
Date:   Thu May 28 21:24:42 2009 +0200

    bgo #575019 â?? Remove deprecated GTK+ symbols in libeog and libfspot
---
 libeog/eog-image.c       |    2 +-
 libeog/image-view.c      |   20 ++++++++++----------
 libeog/ui-image.c        |    4 ++--
 libfspot/f-pixbuf-save.c |    2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/libeog/eog-image.c b/libeog/eog-image.c
index f4d8a02..bea2f5d 100644
--- a/libeog/eog-image.c
+++ b/libeog/eog-image.c
@@ -853,7 +853,7 @@ eog_image_free_mem (EogImage *img)
 	priv = img->priv;
 
 	if (priv->image != NULL) {
-		gdk_pixbuf_unref (priv->image);
+		g_object_unref (priv->image);
 		priv->image = NULL;
 	}
 }
diff --git a/libeog/image-view.c b/libeog/image-view.c
index 2c7bc81..3439748 100644
--- a/libeog/image-view.c
+++ b/libeog/image-view.c
@@ -831,14 +831,14 @@ paint_rectangle (ImageView *view, ArtIRect *rect, GdkInterpType interp_type)
 		d.x0 - xofs, d.y0 - yofs);
 	*/
 
-	gdk_pixbuf_render_to_drawable (tmp,
-				       GTK_WIDGET (view)->window,
-				       GTK_WIDGET (view)->style->black_gc,
-				       0, 0,
-				       d.x0, d.y0,
-				       d.x1 - d.x0, d.y1 - d.y0,
-				       priv->dither,
-				       d.x0 - xofs, d.y0 - yofs);
+	gdk_draw_pixbuf (GTK_WIDGET (view)->window,
+		         GTK_WIDGET (view)->style->black_gc,
+		         tmp,
+			 0, 0,
+		         d.x0, d.y0,
+		         d.x1 - d.x0, d.y1 - d.y0,
+		         priv->dither,
+		         d.x0 - xofs, d.y0 - yofs);
 	
 #endif
 
@@ -1678,7 +1678,7 @@ image_view_set_scroll_adjustments (GtkWidget *widget,
 	if (priv->hadj != hadj) {
 		priv->hadj = hadj;
 		g_object_ref (priv->hadj);
-		gtk_object_sink (GTK_OBJECT (priv->hadj));
+		g_object_ref_sink (GTK_OBJECT (priv->hadj));
 
 		g_signal_connect (priv->hadj, "value_changed",
 				  G_CALLBACK (adjustment_changed_cb),
@@ -1690,7 +1690,7 @@ image_view_set_scroll_adjustments (GtkWidget *widget,
 	if (priv->vadj != vadj) {
 		priv->vadj = vadj;
 		g_object_ref (priv->vadj);
-		gtk_object_sink (GTK_OBJECT (priv->vadj));
+		g_object_ref_sink (GTK_OBJECT (priv->vadj));
 
 		g_signal_connect (priv->vadj, "value_changed",
 				  G_CALLBACK (adjustment_changed_cb),
diff --git a/libeog/ui-image.c b/libeog/ui-image.c
index f8e3c34..16f4062 100644
--- a/libeog/ui-image.c
+++ b/libeog/ui-image.c
@@ -152,9 +152,9 @@ ui_image_new (void)
 
 	ui = UI_IMAGE (g_object_new (TYPE_UI_IMAGE,
 				     "hadjustment", 
-				     GTK_ADJUSTMENT (gtk_object_new (GTK_TYPE_ADJUSTMENT, NULL)),
+				     GTK_ADJUSTMENT (g_object_new (GTK_TYPE_ADJUSTMENT, NULL)),
 				     "vadjustment",
-				     GTK_ADJUSTMENT (gtk_object_new (GTK_TYPE_ADJUSTMENT, NULL)),
+				     GTK_ADJUSTMENT (g_object_new (GTK_TYPE_ADJUSTMENT, NULL)),
 				     NULL));
 	return ui_image_construct (ui);
 }
diff --git a/libfspot/f-pixbuf-save.c b/libfspot/f-pixbuf-save.c
index bbe61f6..1473afb 100644
--- a/libfspot/f-pixbuf-save.c
+++ b/libfspot/f-pixbuf-save.c
@@ -155,7 +155,7 @@ f_pixbuf_save_jpeg (GdkPixbuf *pixbuf,
 	jpeg_destroy_compress (&cinfo);
 
 	fclose (outfile);
-	gdk_pixbuf_unref (pixbuf);
+	g_object_unref (pixbuf);
 
 	return TRUE;
 }