Use standard icon names.

2008-06-18  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtkfilesystem.c (_gtk_file_system_volume_render_icon):
        * gtk/gtkfilechooserbutton.c (change_icon_theme):
        (model_add_bookmarks):
        (model_update_current_folder):
        * gtk/gtkfilechooserdefault.c (shortcuts_insert_file):
        (shortcuts_reload_icons): Use standard icon names.


svn path=/trunk/; revision=20454

4 files changed, 17 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index 83589e4157..8c24234214 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2008-06-18  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkfilesystem.c (_gtk_file_system_volume_render_icon):
+	* gtk/gtkfilechooserbutton.c (change_icon_theme):
+	(model_add_bookmarks):
+	(model_update_current_folder):
+	* gtk/gtkfilechooserdefault.c (shortcuts_insert_file):
+	(shortcuts_reload_icons): Use standard icon names.
+
+2008-06-18  Matthias Clasen  <mclasen@redhat.com>
+
 	* gtk/Makefile.am: Add some more aliases for standard
 	icon names to the builtin icon theme: drive-harddisk,
 	folder, folder-remote, text-x-generic.
diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c
index 6bf13d876e..e9178eeaeb 100644
--- a/gtk/gtkfilechooserbutton.c
+++ b/gtk/gtkfilechooserbutton.c
@@ -1343,7 +1343,7 @@ change_icon_theme (GtkFileChooserButton *button)
 		 * If we switch to a better bookmarks file format (XBEL), we
 		 * should use mime info to get a better icon.
 		 */
-		pixbuf = gtk_icon_theme_load_icon (theme, "gnome-fs-share",
+		pixbuf = gtk_icon_theme_load_icon (theme, "folder-remote",
 						   priv->icon_size, 0, NULL);
 	    }
 	  else
@@ -1879,7 +1879,7 @@ model_add_bookmarks (GtkFileChooserButton *button,
 	    label = _gtk_file_chooser_label_for_file (file);
 
 	  icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (button)));
-	  pixbuf = gtk_icon_theme_load_icon (icon_theme, "gnome-fs-share", 
+	  pixbuf = gtk_icon_theme_load_icon (icon_theme, "folder-remote", 
 					     button->priv->icon_size, 0, NULL);
 
 	  gtk_list_store_insert (store, &iter, pos);
@@ -1984,10 +1984,10 @@ model_update_current_folder (GtkFileChooserButton *button,
       icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (button)));
 
       if (g_file_is_native (file))
-	  pixbuf = gtk_icon_theme_load_icon (icon_theme, "gnome-fs-directory", 
+	  pixbuf = gtk_icon_theme_load_icon (icon_theme, "folder", 
 					     button->priv->icon_size, 0, NULL);
       else
-	  pixbuf = gtk_icon_theme_load_icon (icon_theme, "gnome-fs-share", 
+	  pixbuf = gtk_icon_theme_load_icon (icon_theme, "folder-remote", 
 					     button->priv->icon_size, 0, NULL);
 
       gtk_list_store_set (store, &iter,
@@ -2368,7 +2368,7 @@ update_label_and_image (GtkFileChooserButton *button)
 	  label_text = _gtk_file_system_get_bookmark_label (button->priv->fs, file);
 	  
 	  pixbuf = gtk_icon_theme_load_icon (get_icon_theme (GTK_WIDGET (priv->image)), 
-					     "gnome-fs-regular",
+					     "text-x-generic",
 					     priv->icon_size, 0, NULL);
 	  
 	  gtk_image_set_from_pixbuf (GTK_IMAGE (priv->image), pixbuf);
diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 572e6f8b56..a911c95086 100644
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -1378,7 +1378,7 @@ shortcuts_reload_icons (GtkFileChooserDefault *impl)
 	           * should use mime info to get a better icon.
 	           */
 	          icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (impl)));
-	          pixbuf = gtk_icon_theme_load_icon (icon_theme, "gnome-fs-share", 
+	          pixbuf = gtk_icon_theme_load_icon (icon_theme, "folder-remote", 
 						     impl->icon_size, 0, NULL);
 	        }
             }
@@ -1771,7 +1771,7 @@ shortcuts_insert_file (GtkFileChooserDefault *impl,
            * should use mime info to get a better icon.
            */
           icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (impl)));
-          pixbuf = gtk_icon_theme_load_icon (icon_theme, "gnome-fs-share", 
+          pixbuf = gtk_icon_theme_load_icon (icon_theme, "folder-remote", 
 					     impl->icon_size, 0, NULL);
         }
     }
diff --git a/gtk/gtkfilesystem.c b/gtk/gtkfilesystem.c
index 8ba538e8d9..8ec0e67e28 100644
--- a/gtk/gtkfilesystem.c
+++ b/gtk/gtkfilesystem.c
@@ -1664,17 +1664,11 @@ _gtk_file_system_volume_render_icon (GtkFileSystemVolume  *volume,
 {
   GIcon *icon = NULL;
   GdkPixbuf *pixbuf;
-  const char *harddisk_icons[] = { 
-    "drive-harddisk", 
-    "gnome-dev-harddisk", 
-    "gtk-harddisk",
-    NULL
-  };
 
   DEBUG ("volume_get_icon_name");
 
   if (IS_ROOT_VOLUME (volume))
-    icon = g_themed_icon_new_from_names ((char **) harddisk_icons, -1);
+    icon = g_themed_icon_new ("drive-harddisk");
   else if (G_IS_DRIVE (volume))
     icon = g_drive_get_icon (G_DRIVE (volume));
   else if (G_IS_VOLUME (volume))