X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenu.c;h=2bd382cbab5227e3426ce803f44760a1225ee338;hb=adb9bb700f3235728dacc1d3e3daad81abd93e9a;hp=39dd60d64f6147def144e09b126494b4e85b13fc;hpb=c1b2fc5324522f74a14a5cfa210c95e1509a6e7f;p=chaz%2Fopenbox

diff --git a/openbox/menu.c b/openbox/menu.c
index 39dd60d6..2bd382cb 100644
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -1,9 +1,26 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   menu.c for the Openbox window manager
+   Copyright (c) 2003        Ben Jansens
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   See the COPYING file for a copy of the GNU General Public License.
+*/
+
 #include "debug.h"
 #include "menu.h"
 #include "openbox.h"
 #include "stacking.h"
 #include "client.h"
-#include "grab.h"
 #include "config.h"
 #include "screen.h"
 #include "menuframe.h"
@@ -159,10 +176,12 @@ static void parse_menu_item(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
             GSList *acts = NULL;
 
             for (node = node->children; node; node = node->next)
-                if (!xmlStrcasecmp(node->name, (const xmlChar*) "action"))
-                    acts = g_slist_append(acts, action_parse
-                                          (i, doc, node,
-                                           OB_USER_ACTION_MENU_SELECTION));
+                if (!xmlStrcasecmp(node->name, (const xmlChar*) "action")) {
+                    ObAction *a = action_parse
+                        (i, doc, node, OB_USER_ACTION_MENU_SELECTION);
+                    if (a)
+                        acts = g_slist_append(acts, a);
+                }
             menu_add_normal(state->parent, -1, label, acts);
             g_free(label);
         }
@@ -307,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);