gnome-screensaver r1547 - in trunk: . src

[mccann svn gnome org]

Author: mccann
Date: Thu Nov 13 15:27:40 2008
New Revision: 1547
URL: http://svn.gnome.org/viewvc/gnome-screensaver?rev=1547&view=rev

Log:
2008-11-13  William Jon McCann  <jmccann redhat com>

	* src/gnome-screensaver-preferences.c (config_get_theme):
	Default to blank only if we can't get the theme list.



Modified:
   trunk/ChangeLog
   trunk/src/gnome-screensaver-preferences.c

Modified: trunk/src/gnome-screensaver-preferences.c
==============================================================================
--- trunk/src/gnome-screensaver-preferences.c	(original)
+++ trunk/src/gnome-screensaver-preferences.c	Thu Nov 13 15:27:40 2008
@@ -172,7 +172,7 @@
 config_get_theme (gboolean *is_writable)
 {
         GConfClient *client;
-        char        *name = NULL;
+        char        *name;
         int          mode;
 
         client = gconf_client_get_default ();
@@ -192,6 +192,7 @@
 
         mode = config_get_mode (NULL);
 
+        name = NULL;
         if (mode == GS_MODE_BLANK_ONLY) {
                 name = g_strdup ("__blank-only");
         } else if (mode == GS_MODE_RANDOM) {
@@ -202,10 +203,12 @@
                                               KEY_THEMES,
                                               GCONF_VALUE_STRING,
                                               NULL);
-                if (list) {
+                if (list != NULL) {
                         name = g_strdup (list->data);
                 } else {
                         /* TODO: handle error */
+                        /* default to blank */
+                        name = g_strdup ("__blank-only");
                 }
 
                 g_slist_foreach (list, (GFunc)g_free, NULL);