summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeth Nickell <snickell@stanford.edu>2002-12-31 08:27:28 +0000
committerSeth Nickell <seth@src.gnome.org>2002-12-31 08:27:28 +0000
commit61dce9ccc9bc67566d01ce5d567211c15f4b054d (patch)
treeb461a8700ce54f3f780ee80b4e17b2e8d353bb76
parent08b08ef542bb9d77ebedc0a60fd4f9b74a994af0 (diff)
downloadgnome-control-center-61dce9ccc9bc67566d01ce5d567211c15f4b054d.tar.gz
Thumbnail for themes (most currently) that use "gnome-fs-directory" as the
2002-12-31 Seth Nickell <snickell@stanford.edu> * theme-thumbnail.c: (create_image): Thumbnail for themes (most currently) that use "gnome-fs-directory" as the icon name for folders rather than "folder".
-rw-r--r--capplets/theme-switcher/ChangeLog8
-rw-r--r--capplets/theme-switcher/theme-thumbnail.c8
2 files changed, 15 insertions, 1 deletions
diff --git a/capplets/theme-switcher/ChangeLog b/capplets/theme-switcher/ChangeLog
index 2b44c0938..d81c3ad2c 100644
--- a/capplets/theme-switcher/ChangeLog
+++ b/capplets/theme-switcher/ChangeLog
@@ -1,3 +1,11 @@
+2002-12-31 Seth Nickell <snickell@stanford.edu>
+
+ * theme-thumbnail.c: (create_image):
+
+ Thumbnail for themes (most currently) that use
+ "gnome-fs-directory" as the icon name for folders rather
+ than "folder".
+
2002-12-30 Jody Goldberg <jody@gnome.org>
Apply
diff --git a/capplets/theme-switcher/theme-thumbnail.c b/capplets/theme-switcher/theme-thumbnail.c
index b452fc3c0..bf6b9442b 100644
--- a/capplets/theme-switcher/theme-thumbnail.c
+++ b/capplets/theme-switcher/theme-thumbnail.c
@@ -198,7 +198,13 @@ create_image (ThemeThumbnailData *theme_thumbnail_data,
/* Handle the icon theme */
icon_theme = gnome_icon_theme_new ();
gnome_icon_theme_set_custom_theme (icon_theme, (char *) theme_thumbnail_data->icon_theme_name->data);
- folder_icon_name = gnome_icon_theme_lookup_icon (icon_theme, "folder", 48, NULL, NULL);
+
+ /* Have to try both "folder" and "gnome-fs-directory" seems themes seem to use either name */
+ folder_icon_name = gnome_icon_theme_lookup_icon (icon_theme, "gnome-fs-directory", 48, NULL, NULL);
+ if (folder_icon_name == NULL) {
+ folder_icon_name = gnome_icon_theme_lookup_icon (icon_theme, "folder", 48, NULL, NULL);
+ }
+
if (folder_icon_name != NULL)
{
folder_icon = gdk_pixbuf_new_from_file (folder_icon_name, NULL);