gnome-control-center r8834 - trunk/capplets/common

[jensg svn gnome org]

Author: jensg
Date: Sun Aug  3 08:23:24 2008
New Revision: 8834
URL: http://svn.gnome.org/viewvc/gnome-control-center?rev=8834&view=rev

Log:
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)


Modified:
   trunk/capplets/common/ChangeLog
   trunk/capplets/common/gnome-theme-apply.c

Modified: trunk/capplets/common/gnome-theme-apply.c
==============================================================================
--- trunk/capplets/common/gnome-theme-apply.c	(original)
+++ trunk/capplets/common/gnome-theme-apply.c	Sun Aug  3 08:23:24 2008
@@ -43,7 +43,6 @@
 {
   GConfClient *client;
   gchar *old_key;
-  gchar *new_key;
   gint old_key_int;
   GnomeWindowManager *window_manager;
   GnomeWMSettings wm_settings;
@@ -102,12 +101,9 @@
 
   /* 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);