[nautilus] Use symbolic icons for the sidebar and bookmarks

[William Jon McCann <mccann src gnome org>]

commit f0e28d7fa0788427d0e1ec2eebf8c300bafa33c6
Author: William Jon McCann <jmccann redhat com>
Date:   Wed Jul 11 10:52:09 2012 -0400

    Use symbolic icons for the sidebar and bookmarks

 libnautilus-private/nautilus-icon-info.c  |    3 +-
 libnautilus-private/nautilus-icon-names.h |   36 +++++++++++++---------------
 src/nautilus-bookmarks-window.c           |    3 ++
 src/nautilus-desktop-window.c             |    2 +-
 src/nautilus-places-sidebar.c             |    3 +-
 5 files changed, 24 insertions(+), 23 deletions(-)
---
diff --git a/libnautilus-private/nautilus-icon-info.c b/libnautilus-private/nautilus-icon-info.c
index 1006572..453bd0c 100644
--- a/libnautilus-private/nautilus-icon-info.c
+++ b/libnautilus-private/nautilus-icon-info.c
@@ -686,7 +686,6 @@ nautilus_user_special_directory_get_gicon (GUserDirectory directory)
 
 	switch (directory) {
 
-		ICON_CASE (DESKTOP);
 		ICON_CASE (DOCUMENTS);
 		ICON_CASE (DOWNLOAD);
 		ICON_CASE (MUSIC);
@@ -696,7 +695,7 @@ nautilus_user_special_directory_get_gicon (GUserDirectory directory)
 		ICON_CASE (VIDEOS);
 
 	default:
-		return g_themed_icon_new ("folder");
+		return g_themed_icon_new ("folder-symbolic");
 	}
 
 	#undef ICON_CASE
diff --git a/libnautilus-private/nautilus-icon-names.h b/libnautilus-private/nautilus-icon-names.h
index a012c3f..1fc7d33 100644
--- a/libnautilus-private/nautilus-icon-names.h
+++ b/libnautilus-private/nautilus-icon-names.h
@@ -2,27 +2,25 @@
 #define NAUTILUS_ICON_NAMES_H
 
 /* Icons for places */
-#define NAUTILUS_ICON_DESKTOP		"user-desktop"
-#define NAUTILUS_ICON_FILESYSTEM	"drive-harddisk-system"
-#define NAUTILUS_ICON_FOLDER		"folder"
-#define NAUTILUS_ICON_FOLDER_REMOTE	"folder-remote"
-#define NAUTILUS_ICON_HOME		"user-home"
-#define NAUTILUS_ICON_NETWORK		"network-workgroup"
-#define NAUTILUS_ICON_NETWORK_SERVER	"network-server"
+#define NAUTILUS_ICON_FILESYSTEM	"drive-harddisk-symbolic"
+#define NAUTILUS_ICON_FOLDER		"folder-symbolic"
+#define NAUTILUS_ICON_FOLDER_REMOTE	"folder-remote-symbolic"
+#define NAUTILUS_ICON_HOME		"user-home-symbolic"
+#define NAUTILUS_ICON_NETWORK		"network-workgroup-symbolic"
+#define NAUTILUS_ICON_NETWORK_SERVER	"network-server-symbolic"
 #define NAUTILUS_ICON_SEARCH		"system-search"
-#define NAUTILUS_ICON_TRASH		"user-trash"
-#define NAUTILUS_ICON_TRASH_FULL	"user-trash-full"
-#define NAUTILUS_ICON_DELETE		"edit-delete"
+#define NAUTILUS_ICON_TRASH		"user-trash-symbolic"
+#define NAUTILUS_ICON_TRASH_FULL	"user-trash-full-symbolic"
+#define NAUTILUS_ICON_DELETE		"edit-delete-symbolic"
 
-#define NAUTILUS_ICON_FOLDER_DESKTOP    "user-desktop"
-#define NAUTILUS_ICON_FOLDER_DOCUMENTS  "folder-documents"
-#define NAUTILUS_ICON_FOLDER_DOWNLOAD   "folder-download"
-#define NAUTILUS_ICON_FOLDER_MUSIC      "folder-music"
-#define NAUTILUS_ICON_FOLDER_PICTURES   "folder-pictures"
-#define NAUTILUS_ICON_FOLDER_PUBLIC_SHARE "folder-publicshare"
-#define NAUTILUS_ICON_FOLDER_TEMPLATES  "folder-templates"
-#define NAUTILUS_ICON_FOLDER_VIDEOS     "folder-videos"
-#define NAUTILUS_ICON_FOLDER_SAVED_SEARCH "folder-saved-search"
+#define NAUTILUS_ICON_FOLDER_DOCUMENTS  "folder-documents-symbolic"
+#define NAUTILUS_ICON_FOLDER_DOWNLOAD   "folder-download-symbolic"
+#define NAUTILUS_ICON_FOLDER_MUSIC      "folder-music-symbolic"
+#define NAUTILUS_ICON_FOLDER_PICTURES   "folder-pictures-symbolic"
+#define NAUTILUS_ICON_FOLDER_PUBLIC_SHARE "folder-publicshare-symbolic"
+#define NAUTILUS_ICON_FOLDER_TEMPLATES  "folder-templates-symbolic"
+#define NAUTILUS_ICON_FOLDER_VIDEOS     "folder-videos-symbolic"
+#define NAUTILUS_ICON_FOLDER_SAVED_SEARCH "folder-saved-search-symbolic"
 
 /* Other icons */
 #define NAUTILUS_ICON_TEMPLATE		"text-x-generic-template"
diff --git a/src/nautilus-bookmarks-window.c b/src/nautilus-bookmarks-window.c
index 4c2cdf6..7cee5f1 100644
--- a/src/nautilus-bookmarks-window.c
+++ b/src/nautilus-bookmarks-window.c
@@ -717,6 +717,9 @@ nautilus_bookmarks_window_new (NautilusWindow *parent_window,
 	jump_button = GTK_WIDGET (gtk_builder_get_object (builder, "bookmark_jump_button"));
 
 	rend = gtk_cell_renderer_pixbuf_new ();
+	g_object_set (rend,
+		      "follow-state", TRUE,
+		      NULL);
 	col = gtk_tree_view_column_new_with_attributes ("Icon", 
 							rend,
 							"gicon", 
diff --git a/src/nautilus-desktop-window.c b/src/nautilus-desktop-window.c
index db68816..d8ce4fd 100644
--- a/src/nautilus-desktop-window.c
+++ b/src/nautilus-desktop-window.c
@@ -261,7 +261,7 @@ static NautilusIconInfo *
 real_get_icon (NautilusWindow *window,
 	       NautilusWindowSlot *slot)
 {
-	return nautilus_icon_info_lookup_from_name (NAUTILUS_ICON_DESKTOP, 48);
+	return nautilus_icon_info_lookup_from_name ("user-desktop", 48);
 }
 
 static void
diff --git a/src/nautilus-places-sidebar.c b/src/nautilus-places-sidebar.c
index e5681bc..7e0578a 100644
--- a/src/nautilus-places-sidebar.c
+++ b/src/nautilus-places-sidebar.c
@@ -463,7 +463,7 @@ update_places (NautilusPlacesSidebar *sidebar)
 	if (g_settings_get_boolean (gnome_background_preferences, NAUTILUS_PREFERENCES_SHOW_DESKTOP)) {
 		/* desktop */
 		mount_uri = nautilus_get_desktop_directory_uri ();
-		icon = g_themed_icon_new (NAUTILUS_ICON_DESKTOP);
+		icon = g_themed_icon_new (NAUTILUS_ICON_FOLDER);
 		add_place (sidebar, PLACES_BUILT_IN,
 			   SECTION_COMPUTER,
 			   _("Desktop"), icon,
@@ -3135,6 +3135,7 @@ nautilus_places_sidebar_init (NautilusPlacesSidebar *sidebar)
 
 	/* icon renderer */
 	cell = gtk_cell_renderer_pixbuf_new ();
+	g_object_set (cell, "follow-state", TRUE, NULL);
 	gtk_tree_view_column_pack_start (col, cell, FALSE);
 	gtk_tree_view_column_set_attributes (col, cell,
 					     "gicon", PLACES_SIDEBAR_COLUMN_GICON,