X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenu.c;h=8cc1c872f2c642fb36704fceff3ccde993406922;hb=7f7378cc2b0712de050a93bdfa116788de06a23a;hp=8a4c28b98ff0892a1961dcd5e1f7256427c2f890;hpb=c3b02749d72e0077aff85f29d7a28e5ba329b071;p=chaz%2Fopenbox

diff --git a/openbox/menu.c b/openbox/menu.c
index 8a4c28b9..8cc1c872 100644
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -55,6 +55,13 @@ static gboolean menu_open(gchar *file, xmlDocPtr *doc, xmlNodePtr *node)
     return loaded;
 }
 
+static void client_dest(ObClient *c)
+{
+    /* menus can be associated with a client, so close any that are since
+       we are disappearing now */
+    menu_frame_hide_all_client(c);
+}
+
 void menu_startup()
 {
     xmlDocPtr doc;
@@ -70,31 +77,36 @@ void menu_startup()
 
     menu_parse_inst = parse_startup();
 
+    menu_parse_state.menus = NULL;
+    parse_register(menu_parse_inst, "menu", parse_menu, &menu_parse_state);
+    parse_register(menu_parse_inst, "item", parse_menu_item,
+                   &menu_parse_state);
+    parse_register(menu_parse_inst, "separator",
+                   parse_menu_separator, &menu_parse_state);
+
     for (it = config_menu_files; it; it = g_slist_next(it)) {
-        if (menu_open(it->data, &doc, &node))
+        if (menu_open(it->data, &doc, &node)) {
             loaded = TRUE;
-
+            parse_tree(menu_parse_inst, doc, node->xmlChildrenNode);
+            xmlFreeDoc(doc);
+        }
     }
-    if (!loaded)
-        loaded = menu_open("menu", &doc, &node);
-
-    if (loaded) {
-        menu_parse_state.menus = NULL;
-
-        parse_register(menu_parse_inst, "menu", parse_menu, &menu_parse_state);
-        parse_register(menu_parse_inst, "item", parse_menu_item,
-                       &menu_parse_state);
-        parse_register(menu_parse_inst, "separator",
-                       parse_menu_separator, &menu_parse_state);
-        parse_tree(menu_parse_inst, doc, node->xmlChildrenNode);
-        xmlFreeDoc(doc);
-
-        g_assert(menu_parse_state.menus == NULL);
+    if (!loaded) {
+        if (menu_open("menu", &doc, &node)) {
+            parse_tree(menu_parse_inst, doc, node->xmlChildrenNode);
+            xmlFreeDoc(doc);
+        }
     }
+    
+    g_assert(menu_parse_state.menus == NULL);
+
+    client_add_destructor(client_dest);
 }
 
 void menu_shutdown()
 {
+    client_remove_destructor(client_dest);
+
     parse_shutdown(menu_parse_inst);
     menu_parse_inst = NULL;
 
@@ -191,7 +203,7 @@ static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
 
         if ((menu = menu_new(name, title, NULL))) {
             if (parse_attr_string("execute", node, &script)) {
-                menu->execute = g_strdup(script);
+                menu->execute = ob_expand_tilde(script);
             } else {
                 state->menus = g_slist_prepend(state->menus, menu);
                 parse_tree(i, doc, node->xmlChildrenNode);