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

[jensg svn gnome org]

Author: jensg
Date: Tue Aug 12 16:45:22 2008
New Revision: 8855
URL: http://svn.gnome.org/viewvc/gnome-control-center?rev=8855&view=rev

Log:
2008-08-12  Jens Granseuer  <jensgr gmx net>

	* gnome-theme-apply.c: (gnome_meta_theme_set): make sure we have a
	notification theme before trying to save it (bug #547448)


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	Tue Aug 12 16:45:22 2008
@@ -100,12 +100,15 @@
   g_free (old_key);
 
   /* set the notification theme */
-  old_key = gconf_client_get_string (client, NOTIFICATION_THEME_KEY, NULL);
-  if (compare (old_key, meta_theme_info->notification_theme_name))
+  if (meta_theme_info->notification_theme_name != NULL)
     {
-      gconf_client_set_string (client, NOTIFICATION_THEME_KEY, meta_theme_info->notification_theme_name, NULL);
+      old_key = gconf_client_get_string (client, NOTIFICATION_THEME_KEY, NULL);
+      if (compare (old_key, meta_theme_info->notification_theme_name))
+        {
+          gconf_client_set_string (client, NOTIFICATION_THEME_KEY, meta_theme_info->notification_theme_name, NULL);
+        }
+      g_free (old_key);
     }
-  g_free (old_key);
 
   /* Set the cursor theme key */
 #ifdef HAVE_XCURSOR