disable the "Go there" menu entry when its the current desktop

[chaz/openbox] / openbox / keytree.c

diff --git a/openbox/keytree.c b/openbox/keytree.c
index 9b1403f44b8c07489efc02f91619f72f68384f30..cc3f6407274b3bb7810b3a36f35840eae1318212 100644 (file)
--- a/openbox/keytree.c
+++ b/openbox/keytree.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    keytree.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
@@ -34,7 +34,7 @@ void tree_destroy(KeyBindingTree *tree)
                g_free(it->data);
            g_list_free(tree->keylist);
            for (sit = tree->actions; sit != NULL; sit = sit->next)
-                action_free(sit->data);
+                action_unref(sit->data);
            g_slist_free(tree->actions);
        }
        g_free(tree);
@@ -50,7 +50,7 @@ KeyBindingTree *tree_build(GList *keylist)
     if (g_list_length(keylist) <= 0)
        return NULL; /* nothing in the list.. */
 
-    for (it = g_list_last(keylist); it != NULL; it = it->prev) {
+    for (it = g_list_last(keylist); it; it = g_list_previous(it)) {
        p = ret;
        ret = g_new0(KeyBindingTree, 1);
        if (p == NULL) {
@@ -58,7 +58,7 @@ KeyBindingTree *tree_build(GList *keylist)
 
            /* this is the first built node, the bottom node of the tree */
            ret->keylist = g_list_copy(keylist); /* shallow copy */
-           for (it = ret->keylist; it != NULL; it = it->next) /* deep copy */
+           for (it = ret->keylist; it; it = g_list_next(it)) /* deep copy */
                it->data = g_strdup(it->data);
        }
        ret->first_child = p;