applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Get the Example icon that is specified by the icon theme, if it exists,

Browse source 
2005-08-14  Rodney Dawes  <dobey@novell.com>

	* theme-thumbnail.c (create_image): Get the Example icon that is
	specified by the icon theme, if it exists, and then fall back through
	a better list of icons to use. Gnome uses gnome-fs-directory currently
	for folders, so we should prefer that over folder, but the icon naming
	spec lists x-directory-normal for standard folders, so we should prefer
	that above other folders

	This fixes issues with the wrong icon being drawn in the thumbnail, due
	to the icon theme providing the gnome folder icon, but inheriting from
	another theme which provides a different icon named "folder" for KDE or
	other desktops
This commit is contained in:
Rodney Dawes 2005-08-14 23:58:24 +00:00 • committed by Rodney Dawes
parent ab0a4c5111
commit 0ffa252428
2 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
capplets/common/ChangeLog
View file

@ -1,3 +1,12 @@
2005-08-14 Rodney Dawes <dobey@novell.com>
* theme-thumbnail.c (create_image): Get the Example icon that is
specified by the icon theme, if it exists, and then fall back through
a better list of icons to use. Gnome uses gnome-fs-directory currently
for folders, so we should prefer that over folder, but the icon naming
spec lists x-directory-normal for standard folders, so we should prefer
that above other folders
2005-07-27 Sebastien Bacher <seb128@debian.org> 2005-07-27 Sebastien Bacher <seb128@debian.org>
* capplet-util.c: (capplet_set_icon): set a default icon for capplets, * capplet-util.c: (capplet_set_icon): set a default icon for capplets,

19
capplets/common/theme-thumbnail.c
View file

@ -121,6 +121,7 @@ create_image (ThemeThumbnailData *theme_thumbnail_data,
GdkPixbuf *folder_icon; GdkPixbuf *folder_icon;
GtkIconInfo *folder_icon_info; GtkIconInfo *folder_icon_info;
const gchar *filename; const gchar *filename;
gchar *example_icon_name;
settings = gtk_settings_get_default (); settings = gtk_settings_get_default ();
g_object_set (G_OBJECT (settings), g_object_set (G_OBJECT (settings),
@ -197,11 +198,21 @@ create_image (ThemeThumbnailData *theme_thumbnail_data,
icon_theme = gtk_icon_theme_new (); icon_theme = gtk_icon_theme_new ();
gtk_icon_theme_set_custom_theme (icon_theme, (char *) theme_thumbnail_data->icon_theme_name->data); gtk_icon_theme_set_custom_theme (icon_theme, (char *) theme_thumbnail_data->icon_theme_name->data);
/* Have to try both "folder" and "gnome-fs-directory" seems themes seem to use either name */ folder_icon_info = NULL;
folder_icon_info = gtk_icon_theme_lookup_icon (icon_theme, "folder", 48, GTK_ICON_LOOKUP_FORCE_SVG); /* Get the Example icon name in the theme if specified */
if (folder_icon_info == NULL) { example_icon_name = gtk_icon_theme_get_example_icon_name (icon_theme);
if (example_icon_name != NULL)
folder_icon_info = gtk_icon_theme_lookup_icon (icon_theme, example_icon_name, 48, GTK_ICON_LOOKUP_FORCE_SVG);
g_free (example_icon_name);
/* If an Example is not specified, fall back to using the folder icons in
the order of Icon Nameing Spec, "gnome-fs-directory", and "folder" */
if (folder_icon_info == NULL)
folder_icon_info = gtk_icon_theme_lookup_icon (icon_theme, "x-directory-normal", 48, GTK_ICON_LOOKUP_FORCE_SVG);
if (folder_icon_info == NULL)
folder_icon_info = gtk_icon_theme_lookup_icon (icon_theme, "gnome-fs-directory", 48, GTK_ICON_LOOKUP_FORCE_SVG); folder_icon_info = gtk_icon_theme_lookup_icon (icon_theme, "gnome-fs-directory", 48, GTK_ICON_LOOKUP_FORCE_SVG);
} if (folder_icon_info == NULL)
folder_icon_info = gtk_icon_theme_lookup_icon (icon_theme, "folder", 48, GTK_ICON_LOOKUP_FORCE_SVG);
g_object_unref (icon_theme); g_object_unref (icon_theme);