nautilus r14930 - in trunk: . libnautilus-private src src/file-manager

[thomashpa svn gnome org]

Author: thomashpa
Date: Mon Feb  9 14:15:40 2009
New Revision: 14930
URL: http://svn.gnome.org/viewvc/nautilus?rev=14930&view=rev

Log:
Replace deprecated gdk_pixbuf_unref with g_object_unref

Modified:
   trunk/ChangeLog
   trunk/libnautilus-private/nautilus-icon-canvas-item.c
   trunk/libnautilus-private/nautilus-thumbnails.c
   trunk/src/file-manager/fm-directory-view.c
   trunk/src/file-manager/fm-empty-view.c
   trunk/src/nautilus-bookmarks-window.c
   trunk/src/nautilus-property-browser.c
   trunk/src/nautilus-spatial-window.c

Modified: trunk/libnautilus-private/nautilus-icon-canvas-item.c
==============================================================================
--- trunk/libnautilus-private/nautilus-icon-canvas-item.c	(original)
+++ trunk/libnautilus-private/nautilus-icon-canvas-item.c	Mon Feb  9 14:15:40 2009
@@ -598,7 +598,7 @@
 	draw_label_text (item, GDK_DRAWABLE (pixmap), FALSE, icon_rect);
 	draw_label_text (item, GDK_DRAWABLE (*mask), TRUE, icon_rect);
 
-	gdk_pixbuf_unref (pixbuf);
+	g_object_unref (pixbuf);
 
 	return pixmap;
 }

Modified: trunk/libnautilus-private/nautilus-thumbnails.c
==============================================================================
--- trunk/libnautilus-private/nautilus-thumbnails.c	(original)
+++ trunk/libnautilus-private/nautilus-thumbnails.c	Mon Feb  9 14:15:40 2009
@@ -549,7 +549,7 @@
 			   pixbuf, scale_x, scale_y,
 			   handle->load_func_user_data);
 
-	gdk_pixbuf_unref (pixbuf);
+	g_object_unref (pixbuf);
 
 	g_object_unref (handle->cancellable);
 	g_free (handle->file_path);

Modified: trunk/src/file-manager/fm-directory-view.c
==============================================================================
--- trunk/src/file-manager/fm-directory-view.c	(original)
+++ trunk/src/file-manager/fm-directory-view.c	Mon Feb  9 14:15:40 2009
@@ -6827,7 +6827,7 @@
 			image = gtk_image_new_from_pixbuf (pixbuf);
 			gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (proxy), image);
 
-			gdk_pixbuf_unref (pixbuf);
+			g_object_unref (pixbuf);
 		}
 	}
 }

Modified: trunk/src/file-manager/fm-empty-view.c
==============================================================================
--- trunk/src/file-manager/fm-empty-view.c	(original)
+++ trunk/src/file-manager/fm-empty-view.c	Mon Feb  9 14:15:40 2009
@@ -66,7 +66,7 @@
 	elaps = g_timer_elapsed (timer, NULL);
 	g_timer_stop (timer);
 
-	gdk_pixbuf_unref (icon);
+	g_object_unref (icon);
 	
 	cumu += elaps;
 	g_message ("entire loading: %.3f, cumulative %.3f", elaps, cumu);

Modified: trunk/src/nautilus-bookmarks-window.c
==============================================================================
--- trunk/src/nautilus-bookmarks-window.c	(original)
+++ trunk/src/nautilus-bookmarks-window.c	Mon Feb  9 14:15:40 2009
@@ -857,7 +857,7 @@
 		g_signal_handler_unblock (bookmark_list_store,
 					  row_changed_signal_id);
 
-		gdk_pixbuf_unref (pixbuf);
+		g_object_unref (pixbuf);
 		g_free (name);
 	}
 }

Modified: trunk/src/nautilus-property-browser.c
==============================================================================
--- trunk/src/nautilus-property-browser.c	(original)
+++ trunk/src/nautilus-property-browser.c	Mon Feb  9 14:15:40 2009
@@ -762,7 +762,7 @@
 		pixbuf = eel_gdk_pixbuf_scale_down_to_fit (orig_pixbuf, MAX_ICON_WIDTH, MAX_ICON_HEIGHT);
 	}
 
-	gdk_pixbuf_unref (orig_pixbuf);
+	g_object_unref (orig_pixbuf);
 
 	return pixbuf;
 }
@@ -806,7 +806,7 @@
 		ret = nautilus_customization_make_pattern_chit (color_square, 
 								property_browser->details->property_chit,
 								trim_edges, FALSE);
-		gdk_pixbuf_unref (color_square);
+		g_object_unref (color_square);
 	} else {
 		ret = color_square;
 	}

Modified: trunk/src/nautilus-spatial-window.c
==============================================================================
--- trunk/src/nautilus-spatial-window.c	(original)
+++ trunk/src/nautilus-spatial-window.c	Mon Feb  9 14:15:40 2009
@@ -565,7 +565,7 @@
 
 	if (pixbuf != NULL) {
 		icon = gtk_image_new_from_pixbuf (pixbuf);
-		gdk_pixbuf_unref (pixbuf);
+		g_object_unref (pixbuf);
 	} else {
 		icon = gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU);
 	}
@@ -834,7 +834,7 @@
 
 			if (pixbuf != NULL) {
 				gtk_image_set_from_pixbuf (GTK_IMAGE (window->details->location_icon),  pixbuf);
-				gdk_pixbuf_unref (pixbuf);
+				g_object_unref (pixbuf);
 			} else {
 				gtk_image_set_from_stock (GTK_IMAGE (window->details->location_icon),
 							  GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU);