X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenu.c;h=dbb0c70129417f54213ee9abd775c6cdcee44038;hb=ec21f8c9ec160466ba0a1aa662da8af5cb6a3c9b;hp=da9ba6b851aa2889eaf0b9b92308811b123284bd;hpb=280529221e9349aa07c6c498df6b80b3a8951198;p=chaz%2Fopenbox

diff --git a/openbox/menu.c b/openbox/menu.c
index da9ba6b8..dbb0c701 100644
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -110,13 +110,13 @@ void menu_startup(gboolean reconfig)
     g_assert(menu_parse_state.parent == NULL);
 
     if (!reconfig)
-        client_add_destructor(client_dest, NULL);
+        client_add_destroy_notify(client_dest, NULL);
 }
 
 void menu_shutdown(gboolean reconfig)
 {
     if (!reconfig)
-        client_remove_destructor(client_dest);
+        client_remove_destroy_notify(client_dest);
 
     parse_shutdown(menu_parse_inst);
     menu_parse_inst = NULL;
@@ -357,11 +357,12 @@ static void menu_destroy_hash_value(ObMenu *self)
     g_free(self->name);
     g_free(self->title);
     g_free(self->execute);
+    g_free(self->more_menu);
 
     g_free(self);
 }
 
-void menu_unref(ObMenu *menu)
+void menu_free(ObMenu *menu)
 {
     if (menu)
         g_hash_table_remove(menu_hash, menu->name);