More deprecated function replacement. (gdk_pixbuf this time)

svn path=/trunk/; revision=11291

5 files changed, 8 insertions, 7 deletions

diff --git a/accessx-status/applet.c b/accessx-status/applet.c
index b9c4e9a91..67379b348 100644
--- a/accessx-status/applet.c
+++ b/accessx-status/applet.c
@@ -548,7 +548,7 @@ accessx_status_applet_bouncekeys_image (AccessxStatusApplet *sapplet, XkbAccessX
 				      gdk_pixbuf_get_height (glyph_pixbuf) - 1, 
 				      1., 1., 1.0, 1.0, GDK_INTERP_NEAREST, 255);
 
-		gdk_pixbuf_unref (glyph_pixbuf);
+		g_object_unref (glyph_pixbuf);
 	}
 	return icon_base;
 }
@@ -659,7 +659,7 @@ accessx_status_applet_update (AccessxStatusApplet *sapplet,
 		GdkPixbuf *pixbuf = accessx_status_applet_mousekeys_image (
 			sapplet, &event->state);
 		gtk_image_set_from_pixbuf (GTK_IMAGE (sapplet->mousefoo),  pixbuf);
-		gdk_pixbuf_unref (pixbuf);
+		g_object_unref (pixbuf);
 	}
 
 	if (notify_type & ACCESSX_STATUS_ENABLED) {
@@ -865,7 +865,7 @@ accessx_status_applet_altgraph_icon_set (AccessxStatusApplet *sapplet, GtkWidget
 				      gdk_pixbuf_get_width (glyph_pixbuf),
 				      gdk_pixbuf_get_height (glyph_pixbuf),
 				      0., 0., 1.0, 1.0, GDK_INTERP_NEAREST, alpha);
-		gdk_pixbuf_unref (glyph_pixbuf);
+		g_object_unref (glyph_pixbuf);
 		gtk_icon_source_set_pixbuf (source, pixbuf);
 		gtk_icon_source_set_state (source, states[i]);
 		gtk_icon_source_set_state_wildcarded (source, wildcarded);
diff --git a/battstat/battstat_applet.c b/battstat/battstat_applet.c
index db3562b18..c4c567254 100644
--- a/battstat/battstat_applet.c
+++ b/battstat/battstat_applet.c
@@ -434,7 +434,7 @@ battery_full_notify (GtkWidget *applet)
 
 	/* XXX: it would be nice to pass this as a named icon */
 	notify_notification_set_icon_from_pixbuf (n, icon);
-	gdk_pixbuf_unref (icon);
+	g_object_unref (icon);
 
 	result = notify_notification_show (n, &error);
 	
diff --git a/geyes/ChangeLog b/geyes/ChangeLog
index 7353b1279..067c9ca58 100644
--- a/geyes/ChangeLog
+++ b/geyes/ChangeLog
@@ -1,5 +1,6 @@
 2009-02-17  Callum McKenzie  <callum@spooky-possum.org>
 
+	* themes.c:
 	* geyes.c: Replace more deprecated functions.
 
 ==================== 2.25.90 ======================
diff --git a/geyes/themes.c b/geyes/themes.c
index 42505c598..1cf91b988 100644
--- a/geyes/themes.c
+++ b/geyes/themes.c
@@ -164,11 +164,11 @@ destroy_theme (EyesApplet *eyes_applet)
 {
 	/* Dunno about this - to unref or not to unref? */
 	if (eyes_applet->eye_image != NULL) {
-        	gdk_pixbuf_unref (eyes_applet->eye_image); 
+        	g_object_unref (eyes_applet->eye_image); 
         	eyes_applet->eye_image = NULL;
         }
         if (eyes_applet->pupil_image != NULL) {
-        	gdk_pixbuf_unref (eyes_applet->pupil_image); 
+        	g_object_unref (eyes_applet->pupil_image); 
         	eyes_applet->pupil_image = NULL;
 	}
 	
diff --git a/modemlights/modem-applet.c b/modemlights/modem-applet.c
index 879f68629..af781239c 100644
--- a/modemlights/modem-applet.c
+++ b/modemlights/modem-applet.c
@@ -198,7 +198,7 @@ modem_applet_init (ModemApplet *applet)
 
   pixbuf = gtk_icon_theme_load_icon (priv->icon_theme, "gnome-modem-monitor-applet", 48, 0, NULL);
   gtk_image_set_from_pixbuf (GTK_IMAGE (priv->report_window_image), pixbuf);
-  gdk_pixbuf_unref (pixbuf);
+  g_object_unref (pixbuf);
 
   priv->configured = FALSE;
   priv->enabled = FALSE;