gnome-games r7550 - trunk/aisleriot

[chpe svn gnome org]

Author: chpe
Date: Mon Mar 24 15:03:26 2008
New Revision: 7550
URL: http://svn.gnome.org/viewvc/gnome-games?rev=7550&view=rev

Log:
	* aisleriot.schemas.in: Change default to "" which indicates the
	default theme.
	* window.c: (aisleriot_window_init): Use the default theme for empty
	pref string. Bug #513557.

Modified:
   trunk/aisleriot/ChangeLog
   trunk/aisleriot/aisleriot.schemas.in
   trunk/aisleriot/window.c

Modified: trunk/aisleriot/aisleriot.schemas.in
==============================================================================
--- trunk/aisleriot/aisleriot.schemas.in	(original)
+++ trunk/aisleriot/aisleriot.schemas.in	Mon Mar 24 15:03:26 2008
@@ -6,7 +6,7 @@
       <applyto>/apps/aisleriot/card_style</applyto>
       <owner>aisleriot</owner>
       <type>string</type>
-      <default>bonded.png</default>
+      <default></default>
       <locale name="C">
         <short>Theme file name</short>
         <long>The name of the file with the graphics for the cards.</long>

Modified: trunk/aisleriot/window.c
==============================================================================
--- trunk/aisleriot/window.c	(original)
+++ trunk/aisleriot/window.c	Mon Mar 24 15:03:26 2008
@@ -2353,7 +2353,11 @@
 
   aisleriot_board_set_pixbuf_drawing (priv->board, priv->use_pixbuf_drawing);
 
-  theme = games_conf_get_string_with_default (NULL, aisleriot_conf_get_key (CONF_THEME), GAMES_CARD_THEME_DEFAULT);
+  theme = games_conf_get_string (NULL, aisleriot_conf_get_key (CONF_THEME), NULL);
+  if (!theme || !theme[0]) {
+    g_free (theme);
+    theme = g_strdup (GAMES_CARD_THEME_DEFAULT);
+  }
 #ifdef HAVE_GNOME
   /* Compatibility with old settings */
   if (g_str_has_suffix (theme, ".svg")) {