X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Fmenu.c;h=c52f30131b5b76d212ff6836061142d820ddf07b;hb=4cbfe3eac0570679ae3a8e5c4df20e06d5418573;hp=8cc1c872f2c642fb36704fceff3ccde993406922;hpb=b543af60b3b625f978bec0eacc7da31cd9d347f6;p=chaz%2Fopenbox

diff --git a/openbox/menu.c b/openbox/menu.c
index 8cc1c872..c52f3013 100644
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -55,14 +55,14 @@ static gboolean menu_open(gchar *file, xmlDocPtr *doc, xmlNodePtr *node)
     return loaded;
 }
 
-static void client_dest(ObClient *c)
+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(c);
+    menu_frame_hide_all_client(client);
 }
 
-void menu_startup()
+void menu_startup(gboolean reconfig)
 {
     xmlDocPtr doc;
     xmlNodePtr node;
@@ -92,7 +92,7 @@ void menu_startup()
         }
     }
     if (!loaded) {
-        if (menu_open("menu", &doc, &node)) {
+        if (menu_open("menu.xml", &doc, &node)) {
             parse_tree(menu_parse_inst, doc, node->xmlChildrenNode);
             xmlFreeDoc(doc);
         }
@@ -100,12 +100,14 @@ void menu_startup()
     
     g_assert(menu_parse_state.menus == NULL);
 
-    client_add_destructor(client_dest);
+    if (!reconfig)
+        client_add_destructor(client_dest);
 }
 
-void menu_shutdown()
+void menu_shutdown(gboolean reconfig)
 {
-    client_remove_destructor(client_dest);
+    if (!reconfig)
+        client_remove_destructor(client_dest);
 
     parse_shutdown(menu_parse_inst);
     menu_parse_inst = NULL;