nemo-trash-monitor.c: Add a new path for the symbolic icon. Our file

views need a non-symbolic icon.

Author: mtwebster

libnemo-private/nemo-trash-monitor.c

@@ -37,6 +37,7 @@
 struct NemoTrashMonitorDetails {
 	gboolean empty;
 	GIcon *icon;
+    GIcon *symbolic_icon;
 	GFileMonitor *file_monitor;
 };
 
@@ -60,6 +61,9 @@ nemo_trash_monitor_finalize (GObject *object)
 	if (trash_monitor->details->icon) {
 		g_object_unref (trash_monitor->details->icon);
 	}
+    if (trash_monitor->details->symbolic_icon) {
+        g_object_unref (trash_monitor->details->icon);
+    }
 	if (trash_monitor->details->file_monitor) {
 		g_object_unref (trash_monitor->details->file_monitor);
 	}
@@ -95,9 +99,11 @@ update_icon (NemoTrashMonitor *trash_monitor)
 	g_clear_object (&trash_monitor->details->icon);
 
 	if (trash_monitor->details->empty) {
-		trash_monitor->details->icon = g_themed_icon_new (NEMO_ICON_SYMBOLIC_TRASH);
+		trash_monitor->details->icon = g_themed_icon_new (NEMO_ICON_TRASH);
+        trash_monitor->details->symbolic_icon = g_themed_icon_new (NEMO_ICON_SYMBOLIC_TRASH);
 	} else {
-		trash_monitor->details->icon = g_themed_icon_new (NEMO_ICON_SYMBOLIC_TRASH_FULL);
+		trash_monitor->details->icon = g_themed_icon_new (NEMO_ICON_TRASH_FULL);
+        trash_monitor->details->symbolic_icon = g_themed_icon_new (NEMO_ICON_SYMBOLIC_TRASH_FULL);
 	}
 }
 
@@ -243,6 +249,18 @@ nemo_trash_monitor_get_icon (void)
 	return NULL;
 }
 
+GIcon *
+nemo_trash_monitor_get_symbolic_icon (void)
+{
+    NemoTrashMonitor *monitor;
+
+    monitor = nemo_trash_monitor_get ();
+    if (monitor->details->symbolic_icon) {
+        return g_object_ref (monitor->details->symbolic_icon);
+    }
+    return NULL;
+}
+
 void
 nemo_trash_monitor_add_new_trash_directories (void)
 {

libnemo-private/nemo-trash-monitor.h

@@ -62,6 +62,7 @@ GType			nemo_trash_monitor_get_type				(void);
 NemoTrashMonitor   *nemo_trash_monitor_get 				(void);
 gboolean		nemo_trash_monitor_is_empty 			(void);
 GIcon                  *nemo_trash_monitor_get_icon                         (void);
+GIcon                  *nemo_trash_monitor_get_symbolic_icon                (void);
 
 void		        nemo_trash_monitor_add_new_trash_directories        (void);
 

src/nemo-pathbar.c

@@ -247,14 +247,10 @@ trash_state_changed_cb (NemoTrashMonitor *monitor,
         button_data = BUTTON_DATA (list->data);
         if (g_file_equal (file, button_data->path)) {
             GIcon *icon;
-            NemoIconInfo *icon_info;
-            GdkPixbuf *pixbuf;
-
-            icon = nemo_trash_monitor_get_icon ();
-            icon_info = nemo_icon_info_lookup (icon, NEMO_PATH_BAR_ICON_SIZE,
-                                               gtk_widget_get_scale_factor (GTK_WIDGET (path_bar)));
-            pixbuf = nemo_icon_info_get_pixbuf_at_size (icon_info, NEMO_PATH_BAR_ICON_SIZE);
-            gtk_image_set_from_pixbuf (GTK_IMAGE (button_data->image), pixbuf);
+
+            icon = nemo_trash_monitor_get_symbolic_icon ();
+
+            gtk_image_set_from_gicon (GTK_IMAGE (button_data->image), icon, GTK_ICON_SIZE_MENU);
         }
     }
     g_object_unref (file);

src/nemo-places-sidebar.c

@@ -826,7 +826,7 @@ update_places (NemoPlacesSidebar *sidebar)
         sidebar->bottom_bookend_uri = g_strdup (mount_uri);
 
     mount_uri = (char *)"trash:///"; /* No need to strdup */
-    icon = nemo_trash_monitor_get_icon ();
+    icon = nemo_trash_monitor_get_symbolic_icon ();
     cat_iter = add_place (sidebar, PLACES_BUILT_IN,
                            SECTION_COMPUTER,
                            _("Trash"), icon, mount_uri,

src/nemo-window-menus.c

@@ -460,7 +460,7 @@ trash_state_changed_cb (NemoTrashMonitor *monitor,
 	action_group = nemo_window_get_main_action_group (window);
 	action = gtk_action_group_get_action (action_group, "Go to Trash");
 
-	gicon = nemo_trash_monitor_get_icon ();
+	gicon = nemo_trash_monitor_get_symbolic_icon ();
 
 	if (gicon) {
 		g_object_set (action, "gicon", gicon, NULL);