From: Dana Jansens <danakj@orodu.net>
Date: Sat, 2 Jun 2007 17:31:02 +0000 (+0000)
Subject: rename menu.items.* to menu.*
X-Git-Tag: openbox-3_3_995-RELEASE~12
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=698f285488736a5012ff149a90e1fb7784ae9932;p=dana%2Fopenbox.git

rename menu.items.* to menu.*
---

diff --git a/render/theme.c b/render/theme.c
index 9c1db343..9111504b 100644
--- a/render/theme.c
+++ b/render/theme.c
@@ -536,14 +536,20 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
                          TRUE))
         set_default_appearance(theme->a_unfocused_grip);
     if (!read_appearance(db, inst,
+                         "menu.bg", theme->a_menu,
+                         FALSE) &&
+        !read_appearance(db, inst,
                          "menu.items.bg", theme->a_menu,
-                         FALSE))
+                         FALSE) &&
         set_default_appearance(theme->a_menu);
     if (!read_appearance(db, inst,
                          "menu.title.bg", theme->a_menu_title,
                          TRUE))
         set_default_appearance(theme->a_menu_title);
     if (!read_appearance(db, inst,
+                         "menu.active.bg", theme->a_menu_selected,
+                         TRUE) &&
+        !read_appearance(db, inst,
                          "menu.items.active.bg", theme->a_menu_selected,
                          TRUE))
         set_default_appearance(theme->a_menu_selected);