rename menu.items.* to menu.*

diff --git a/render/theme.c b/render/theme.c
index 9c1db343b4f87c42a148a0402d2940b5e2f70c51..9111504b7a332dce22a62eefa35bc784edb3984c 100644 (file)
--- 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);