merge r7100 from trunk

diff --git a/render/theme.c b/render/theme.c
index e54523173d94a42c96315752da1986160b8c21b3..733b6b1696d3f50c5e1b29945a6db235f1f38759 100644 (file)
--- a/render/theme.c
+++ b/render/theme.c
@@ -64,6 +64,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
             g_message("Unable to load the theme '%s'", name);
             g_message("Falling back to the default theme '%s'",
                       DEFAULT_THEME);
+            /* fallback to the default theme */
+            name = NULL;
         }
     }
     if (db == NULL) {
@@ -72,13 +74,12 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
             g_message("Unable to load the theme '%s'", DEFAULT_THEME);
             return NULL;
         }
-        name = DEFAULT_THEME;
     }
 
     theme = g_new0(RrTheme, 1);
 
     theme->inst = inst;
-    theme->name = g_strdup(name);
+    theme->name = g_strdup(name ? name : DEFAULT_THEME);
 
     theme->a_disabled_focused_max = RrAppearanceNew(inst, 1);
     theme->a_disabled_unfocused_max = RrAppearanceNew(inst, 1);