match the func prototypes in the header

[chaz/openbox] / openbox / menu.c

diff --git a/openbox/menu.c b/openbox/menu.c
index 8a4c28b98ff0892a1961dcd5e1f7256427c2f890..c52f30131b5b76d212ff6836061142d820ddf07b 100644 (file)
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -55,7 +55,14 @@ static gboolean menu_open(gchar *file, xmlDocPtr *doc, xmlNodePtr *node)
     return loaded;
 }
 
-void menu_startup()
+static void client_dest(gpointer client)
+{
+    /* menus can be associated with a client, so close any that are since
+       we are disappearing now */
+    menu_frame_hide_all_client(client);
+}
+
+void menu_startup(gboolean reconfig)
 {
     xmlDocPtr doc;
     xmlNodePtr node;
@@ -70,31 +77,38 @@ 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.xml", &doc, &node)) {
+            parse_tree(menu_parse_inst, doc, node->xmlChildrenNode);
+            xmlFreeDoc(doc);
+        }
     }
+    
+    g_assert(menu_parse_state.menus == NULL);
+
+    if (!reconfig)
+        client_add_destructor(client_dest);
 }
 
-void menu_shutdown()
+void menu_shutdown(gboolean reconfig)
 {
+    if (!reconfig)
+        client_remove_destructor(client_dest);
+
     parse_shutdown(menu_parse_inst);
     menu_parse_inst = NULL;
 
@@ -191,7 +205,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);