lwindow needs a type

[chaz/openbox] / render / theme.c

diff --git a/render/theme.c b/render/theme.c
index 29f0663ccb26b53c12fa91723b5557ecdafc507f..4fc3d6a1b758b7820e384ceeebd76956c46147eb 100644 (file)
--- a/render/theme.c
+++ b/render/theme.c
@@ -63,8 +63,9 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
     if (name) {
        db = loaddb(theme, name);
         if (db == NULL) {
-           g_warning("Failed to load the theme '%s'", name);
-           g_message("Falling back to the default: '%s'", DEFAULT_THEME);
+           g_warning("Failed to load the theme '%s'\n"
+                      "Falling back to the default: '%s'",
+                      name, DEFAULT_THEME);
        } else
             theme->name = g_path_get_basename(name);
     }
@@ -135,6 +136,9 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
     theme->title_layout = g_strdup(font_str);
 
     /* load direct dimensions */
+    if (!read_int(db, "menuOverlap", &theme->menu_overlap) ||
+       theme->menu_overlap < 0 || theme->menu_overlap > 20)
+        theme->handle_height = 0;
     if (!read_int(db, "handleWidth", &theme->handle_height) ||
        theme->handle_height < 0 || theme->handle_height > 100)
         theme->handle_height = 6;