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

if the metatheme loaded doesn't define a notification theme don't set it

Browse source 
2008-08-03  Jens Granseuer  <jensgr@gmx.net>

	* gnome-theme-apply.c: (gnome_meta_theme_set): if the metatheme loaded
	doesn't define a notification theme don't set it to "standard" (bug
	#546036)

svn path=/trunk/; revision=8834
This commit is contained in:
Jens Granseuer 2008-08-03 08:23:24 +00:00 • committed by Jens Granseuer
parent bdcf243ddf
commit 05ce6eaabe
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
capplets/common/ChangeLog
View file

@ -1,3 +1,9 @@
2008-08-03 Jens Granseuer <jensgr@gmx.net>
* gnome-theme-apply.c: (gnome_meta_theme_set): if the metatheme loaded
doesn't define a notification theme don't set it to "standard" (bug
#546036)
2008-07-29 Jens Granseuer <jensgr@gmx.net>
* file-transfer-dialog.c: (file_transfer_job_destroy),

8
capplets/common/gnome-theme-apply.c
View file

@ -43,7 +43,6 @@ gnome_meta_theme_set (GnomeThemeMetaInfo *meta_theme_info)
{
GConfClient *client;
gchar *old_key;
gchar *new_key;
gint old_key_int;
GnomeWindowManager *window_manager;
GnomeWMSettings wm_settings;
@ -102,12 +101,9 @@ gnome_meta_theme_set (GnomeThemeMetaInfo *meta_theme_info)
/* set the notification theme */
old_key = gconf_client_get_string (client, NOTIFICATION_THEME_KEY, NULL);
new_key = meta_theme_info->notification_theme_name;
if (new_key == NULL)
new_key = "standard";
if (compare (old_key, new_key))
if (compare (old_key, meta_theme_info->notification_theme_name))
{
gconf_client_set_string (client, NOTIFICATION_THEME_KEY, new_key, NULL);
gconf_client_set_string (client, NOTIFICATION_THEME_KEY, meta_theme_info->notification_theme_name, NULL);
}
g_free (old_key);