From 8c877d66889ee3845bcd4531fc7df0f9cbb7cb01 Mon Sep 17 00:00:00 2001 From: Rodney Dawes Date: Wed, 14 Dec 2005 19:32:04 +0000 Subject: [PATCH] Default to "drive-harddisk" and then fall back to gnome-dev-harddisk 2005-12-14 Rodney Dawes * gtk/gtkfilesystemunix.c (gtk_file_system_unix_volume_render_icon): Default to "drive-harddisk" and then fall back to gnome-dev-harddisk (get_icon_for_mime_type): Look up the mime type icons according to the Icon Naming Specification and then fall back to the gnome-mime- prefix for the mime type icons Fixes #323655 --- ChangeLog | 10 ++++++++++ ChangeLog.pre-2-10 | 10 ++++++++++ gtk/gtkfilesystemunix.c | 21 +++++++++++++++++++++ 3 files changed, 41 insertions(+) diff --git a/ChangeLog b/ChangeLog index 245bae6787..ef56cb5e6a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2005-12-14 Rodney Dawes + + * gtk/gtkfilesystemunix.c (gtk_file_system_unix_volume_render_icon): + Default to "drive-harddisk" and then fall back to gnome-dev-harddisk + (get_icon_for_mime_type): Look up the mime type icons according to the + Icon Naming Specification and then fall back to the gnome-mime- prefix + for the mime type icons + + Fixes #323655 + 2005-12-14 Matthias Clasen * gtk/gtkdnd.c (gtk_drag_set_icon_name): Warn if the icon diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 245bae6787..ef56cb5e6a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,13 @@ +2005-12-14 Rodney Dawes + + * gtk/gtkfilesystemunix.c (gtk_file_system_unix_volume_render_icon): + Default to "drive-harddisk" and then fall back to gnome-dev-harddisk + (get_icon_for_mime_type): Look up the mime type icons according to the + Icon Naming Specification and then fall back to the gnome-mime- prefix + for the mime type icons + + Fixes #323655 + 2005-12-14 Matthias Clasen * gtk/gtkdnd.c (gtk_drag_set_icon_name): Warn if the icon diff --git a/gtk/gtkfilesystemunix.c b/gtk/gtkfilesystemunix.c index 68653e28c9..31fc01c0c8 100644 --- a/gtk/gtkfilesystemunix.c +++ b/gtk/gtkfilesystemunix.c @@ -808,6 +808,10 @@ gtk_file_system_unix_volume_render_icon (GtkFileSystem *file_system, { GdkPixbuf *pixbuf; + pixbuf = get_cached_icon (widget, "drive-harddisk", pixel_size); + if (pixbuf) + return pixbuf; + pixbuf = get_cached_icon (widget, "gnome-dev-harddisk", pixel_size); if (pixbuf) return pixbuf; @@ -1291,6 +1295,23 @@ get_icon_for_mime_type (GtkWidget *widget, if (!separator) return NULL; /* maybe we should return a GError with "invalid MIME-type" */ + icon_name = g_string_new (""); + g_string_append_len (icon_name, mime_type, separator - mime_type); + g_string_append_c (icon_name, '-'); + g_string_append (icon_name, separator + 1); + pixbuf = get_cached_icon (widget, icon_name->str, pixel_size); + g_string_free (icon_name, TRUE); + if (pixbuf) + return pixbuf; + + icon_name = g_string_new (""); + g_string_append_len (icon_name, mime_type, separator - mime_type); + g_string_append (icon_name, "-x-generic"); + pixbuf = get_cached_icon (widget, icon_name->str, pixel_size); + g_string_free (icon_name, TRUE); + if (pixbuf) + return pixbuf; + icon_name = g_string_new ("gnome-mime-"); g_string_append_len (icon_name, mime_type, separator - mime_type); g_string_append_c (icon_name, '-');