[nautilus] places-sidebar: simplfy setting eject icon

[Cosimo Cecchi <cosimoc src gnome org>]

commit b2e8339d9f49770db0f6a523c8bf77b11d7eace3
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Fri Oct 19 16:28:51 2012 -0400

    places-sidebar: simplfy setting eject icon

 src/nautilus-places-sidebar.c |   19 ++++---------------
 1 files changed, 4 insertions(+), 15 deletions(-)
---
diff --git a/src/nautilus-places-sidebar.c b/src/nautilus-places-sidebar.c
index b427e0a..10182a7 100644
--- a/src/nautilus-places-sidebar.c
+++ b/src/nautilus-places-sidebar.c
@@ -129,7 +129,6 @@ enum {
 	PLACES_SIDEBAR_COLUMN_NO_EJECT,
 	PLACES_SIDEBAR_COLUMN_BOOKMARK,
 	PLACES_SIDEBAR_COLUMN_TOOLTIP,
-	PLACES_SIDEBAR_COLUMN_EJECT_GICON,
 	PLACES_SIDEBAR_COLUMN_SECTION_TYPE,
 	PLACES_SIDEBAR_COLUMN_HEADING_TEXT,
 
@@ -295,7 +294,6 @@ add_place (NautilusPlacesSidebar *sidebar,
 	   const char *tooltip)
 {
 	GtkTreeIter           iter;
-	GIcon *eject;
 	gboolean show_eject, show_unmount;
 	gboolean show_eject_button;
 
@@ -314,12 +312,6 @@ add_place (NautilusPlacesSidebar *sidebar,
 		show_eject_button = (show_unmount || show_eject);
 	}
 
-	if (show_eject_button) {
-		eject = g_themed_icon_new_with_default_fallbacks ("media-eject-symbolic");
-	} else {
-		eject = NULL;
-	}
-
 	gtk_list_store_append (sidebar->store, &iter);
 	gtk_list_store_set (sidebar->store, &iter,
 			    PLACES_SIDEBAR_COLUMN_GICON, icon,
@@ -334,13 +326,8 @@ add_place (NautilusPlacesSidebar *sidebar,
 			    PLACES_SIDEBAR_COLUMN_NO_EJECT, !show_eject_button,
 			    PLACES_SIDEBAR_COLUMN_BOOKMARK, place_type != PLACES_BOOKMARK,
 			    PLACES_SIDEBAR_COLUMN_TOOLTIP, tooltip,
-			    PLACES_SIDEBAR_COLUMN_EJECT_GICON, eject,
 			    PLACES_SIDEBAR_COLUMN_SECTION_TYPE, section_type,
 			    -1);
-
-	if (eject != NULL) {
-		g_object_unref (eject);
-	}
 }
 
 typedef struct {
@@ -3068,6 +3055,7 @@ nautilus_places_sidebar_init (NautilusPlacesSidebar *sidebar)
 	GtkTreeViewColumn *col;
 	GtkCellRenderer   *cell;
 	GtkTreeSelection  *selection;
+	GIcon             *eject;
 
 	sidebar->volume_monitor = g_volume_monitor_get ();
 	
@@ -3143,6 +3131,7 @@ nautilus_places_sidebar_init (NautilusPlacesSidebar *sidebar)
 	/* eject icon renderer */
 	cell = gtk_cell_renderer_pixbuf_new ();
 	sidebar->eject_icon_cell_renderer = cell;
+	eject = g_themed_icon_new_with_default_fallbacks ("media-eject-symbolic");
 	g_object_set (cell,
 		      "mode", GTK_CELL_RENDERER_MODE_ACTIVATABLE,
 		      "stock-size", GTK_ICON_SIZE_MENU,
@@ -3151,12 +3140,13 @@ nautilus_places_sidebar_init (NautilusPlacesSidebar *sidebar)
 			 this even though we tell it not to. */
 		      "xalign", 1.0,
 		      "follow-state", TRUE,
+		      "gicon", eject,
 		      NULL);
 	gtk_tree_view_column_pack_start (col, cell, FALSE);
 	gtk_tree_view_column_set_attributes (col, cell,
 					     "visible", PLACES_SIDEBAR_COLUMN_EJECT,
-					     "gicon", PLACES_SIDEBAR_COLUMN_EJECT_GICON,
 					     NULL);
+	g_object_unref (eject);
 
 	/* normal text renderer */
 	cell = gtk_cell_renderer_text_new ();
@@ -3467,7 +3457,6 @@ nautilus_shortcuts_model_new (NautilusPlacesSidebar *sidebar)
 		G_TYPE_BOOLEAN,
 		G_TYPE_BOOLEAN,
 		G_TYPE_STRING,
-		G_TYPE_ICON,
 		G_TYPE_INT,
 		G_TYPE_STRING
 	};