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

Prevent cursor themes from being recognized as icon themes.

Browse source 
2007-07-28  Denis Washington  <denisw@svn.gnome.org>

	* gnome-theme-info.c: (read_icon_theme):
	Prevent cursor themes from being recognized as icon themes.

svn path=/trunk/; revision=7913
This commit is contained in:
Denis Washington 2007-07-28 13:05:59 +00:00 • committed by Denis Washington
parent 0660969a64
commit b608a53acb
2 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
capplets/common/ChangeLog
View file

@ -1,3 +1,8 @@
2007-07-28 Denis Washington <denisw@svn.gnome.org>
* gnome-theme-info.c: (read_icon_theme):
Prevent cursor themes from being recognized as icon themes.
2007-07-28 Thomas Wood <thos@gnome.org> 2007-07-28 Thomas Wood <thos@gnome.org>
* gnome-theme-info.h: Add missing include * gnome-theme-info.h: Add missing include

10
capplets/common/gnome-theme-info.c
View file

@ -343,6 +343,7 @@ read_icon_theme (GnomeVFSURI *icon_theme_uri)
GnomeDesktopItem *icon_theme_ditem; GnomeDesktopItem *icon_theme_ditem;
gchar *icon_theme_file; gchar *icon_theme_file;
const gchar *name; const gchar *name;
const gchar *directories;
const gchar *hidden_theme_icon; const gchar *hidden_theme_icon;
icon_theme_file = gnome_vfs_uri_to_string (icon_theme_uri, GNOME_VFS_URI_HIDE_NONE); icon_theme_file = gnome_vfs_uri_to_string (icon_theme_uri, GNOME_VFS_URI_HIDE_NONE);
@ -361,6 +362,15 @@ read_icon_theme (GnomeVFSURI *icon_theme_uri)
return NULL; return NULL;
} }
/* If index.theme has no Directories entry, it is only a cursor theme */
directories = gnome_desktop_item_get_string (icon_theme_ditem, "Icon Theme/Directories");
if (directories == NULL)
{
gnome_desktop_item_unref (icon_theme_ditem);
g_free (icon_theme_file);
return NULL;
}
hidden_theme_icon = gnome_desktop_item_get_string (icon_theme_ditem, "Icon Theme/Hidden"); hidden_theme_icon = gnome_desktop_item_get_string (icon_theme_ditem, "Icon Theme/Hidden");
if (hidden_theme_icon == NULL || if (hidden_theme_icon == NULL ||
strcmp (hidden_theme_icon, "false") == 0) strcmp (hidden_theme_icon, "false") == 0)