X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenu.c;h=69256f5f5977fb9bade95286cadb0a9743a2ccad;hb=fa962c1604bac1b5a6c3656b71c3145436f2392b;hp=cf3fa5551b6c1661e887fb14e3cc708b37c7bb9d;hpb=0cceca230318a63daa9ec896575379046f5d3a49;p=chaz%2Fopenbox

diff --git a/openbox/menu.c b/openbox/menu.c
index cf3fa555..69256f5f 100644
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -51,7 +51,7 @@ static void parse_menu_separator(ObParseInst *i,
 static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
                        gpointer data);
 
-static void client_dest(gpointer client)
+static void client_dest(ObClient *client, gpointer data)
 {
     /* menus can be associated with a client, so close any that are since
        we are disappearing now */
@@ -98,7 +98,7 @@ void menu_startup(gboolean reconfig)
     g_assert(menu_parse_state.parent == NULL);
 
     if (!reconfig)
-        client_add_destructor(client_dest);
+        client_add_destructor(client_dest, NULL);
 }
 
 void menu_shutdown(gboolean reconfig)
@@ -326,7 +326,7 @@ void menu_entry_free(ObMenuEntry *self)
         case OB_MENU_ENTRY_TYPE_NORMAL:
             g_free(self->data.normal.label);
             while (self->data.normal.actions) {
-                action_free(self->data.normal.actions->data);
+                action_unref(self->data.normal.actions->data);
                 self->data.normal.actions =
                     g_slist_delete_link(self->data.normal.actions,
                                         self->data.normal.actions);