only show falling back msg when its true

[chaz/openbox] / render / theme.c

diff --git a/render/theme.c b/render/theme.c
index 08d4b07db67b0320614d53ec4eb61f8894a4146d..ed836efd058cd8914156d3f6cf5a50f97fc99649 100644 (file)
--- a/render/theme.c
+++ b/render/theme.c
@@ -65,6 +65,7 @@ static gboolean find_appearance(ParseState *ps, xmlNodePtr n, const gchar *names
 #define FIND(type, args...) find_##type(&ps, root, args)
 
 RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name,
+                    gboolean allow_fallback,
                     RrFont *active_window_font, RrFont *inactive_window_font,
                     RrFont *menu_title_font, RrFont *menu_item_font,
                     RrFont *osd_font)
@@ -79,18 +80,22 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name,
     if (name) {
         if (!parse_load_theme(name, &ps.doc, &root, &ps.path)) {
             g_message("Unable to load the theme '%s'", name);
-            g_message("Falling back to the default theme '%s'",
-                      DEFAULT_THEME);
+            if (allow_fallback)
+                g_message("Falling back to the default theme '%s'",
+                          DEFAULT_THEME);
             /* make it fall back to default theme */
             name = NULL;
         }
     }
-    if (!name) {
+    if (name == NULL && allow_fallback) {
         if (!parse_load_theme(DEFAULT_THEME, &ps.doc, &root, &ps.path)) {
             g_message("Unable to load the theme '%s'", DEFAULT_THEME);
             return NULL;
         }
     }
+    if (name == NULL)
+        return NULL;
+
     ps.inst = inst;
 
     theme = g_new0(RrTheme, 1);