[nautilus] Use GIcons for places instead of pixbufs

[William Jon McCann <mccann src gnome org>]

commit c33a5e6e10639fa57acaaf0a319057fc5fbff7fd
Author: William Jon McCann <jmccann redhat com>
Date:   Tue Jul 10 20:54:26 2012 -0400

    Use GIcons for places instead of pixbufs
    
    This will allow us to use symbolic icons

 src/nautilus-places-sidebar.c |   21 ++++-----------------
 1 files changed, 4 insertions(+), 17 deletions(-)
---
diff --git a/src/nautilus-places-sidebar.c b/src/nautilus-places-sidebar.c
index 51f77af..e5681bc 100644
--- a/src/nautilus-places-sidebar.c
+++ b/src/nautilus-places-sidebar.c
@@ -125,7 +125,7 @@ enum {
 	PLACES_SIDEBAR_COLUMN_VOLUME,
 	PLACES_SIDEBAR_COLUMN_MOUNT,
 	PLACES_SIDEBAR_COLUMN_NAME,
-	PLACES_SIDEBAR_COLUMN_ICON,
+	PLACES_SIDEBAR_COLUMN_GICON,
 	PLACES_SIDEBAR_COLUMN_INDEX,
 	PLACES_SIDEBAR_COLUMN_EJECT,
 	PLACES_SIDEBAR_COLUMN_NO_EJECT,
@@ -296,22 +296,13 @@ add_place (NautilusPlacesSidebar *sidebar,
 	   const int index,
 	   const char *tooltip)
 {
-	GdkPixbuf            *pixbuf;
 	GtkTreeIter           iter;
 	GIcon *eject;
-	NautilusIconInfo *icon_info;
-	int icon_size;
 	gboolean show_eject, show_unmount;
 	gboolean show_eject_button;
 
 	check_heading_for_section (sidebar, section_type);
 
-	icon_size = nautilus_get_icon_size_for_stock_size (GTK_ICON_SIZE_MENU);
-	icon_info = nautilus_icon_info_lookup (icon, icon_size);
-
-	pixbuf = nautilus_icon_info_get_pixbuf_at_size (icon_info, icon_size);
-	g_object_unref (icon_info);
-
 	check_unmount_and_eject (mount, volume, drive,
 				 &show_unmount, &show_eject);
 
@@ -333,7 +324,7 @@ add_place (NautilusPlacesSidebar *sidebar,
 
 	gtk_list_store_append (sidebar->store, &iter);
 	gtk_list_store_set (sidebar->store, &iter,
-			    PLACES_SIDEBAR_COLUMN_ICON, pixbuf,
+			    PLACES_SIDEBAR_COLUMN_GICON, icon,
 			    PLACES_SIDEBAR_COLUMN_NAME, name,
 			    PLACES_SIDEBAR_COLUMN_URI, uri,
 			    PLACES_SIDEBAR_COLUMN_DRIVE, drive,
@@ -349,10 +340,6 @@ add_place (NautilusPlacesSidebar *sidebar,
 			    PLACES_SIDEBAR_COLUMN_SECTION_TYPE, section_type,
 			    -1);
 
-	if (pixbuf != NULL) {
-		g_object_unref (pixbuf);
-	}
-
 	if (eject != NULL) {
 		g_object_unref (eject);
 	}
@@ -3150,7 +3137,7 @@ nautilus_places_sidebar_init (NautilusPlacesSidebar *sidebar)
 	cell = gtk_cell_renderer_pixbuf_new ();
 	gtk_tree_view_column_pack_start (col, cell, FALSE);
 	gtk_tree_view_column_set_attributes (col, cell,
-					     "pixbuf", PLACES_SIDEBAR_COLUMN_ICON,
+					     "gicon", PLACES_SIDEBAR_COLUMN_GICON,
 					     NULL);
 	gtk_tree_view_column_set_cell_data_func (col, cell,
 						 icon_cell_renderer_func,
@@ -3499,7 +3486,7 @@ nautilus_shortcuts_model_new (NautilusPlacesSidebar *sidebar)
 		G_TYPE_VOLUME,
 		G_TYPE_MOUNT,
 		G_TYPE_STRING,
-		GDK_TYPE_PIXBUF,
+		G_TYPE_ICON,
 		G_TYPE_INT,
 		G_TYPE_BOOLEAN,
 		G_TYPE_BOOLEAN,