X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient_list_menu.c;h=985cb729267e1fac1b0825ef246cb89ead415048;hb=48c3a34f57539ed8040d9a8ad5a1da58cd1666de;hp=3a3e5a1018e625e8a2467c9b4772e84e2b0b0c74;hpb=87541ea377f0146aabaf477942af3debbc9c3a67;p=chaz%2Fopenbox diff --git a/openbox/client_list_menu.c b/openbox/client_list_menu.c index 3a3e5a10..985cb729 100644 --- a/openbox/client_list_menu.c +++ b/openbox/client_list_menu.c @@ -50,10 +50,10 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data) for (it = focus_order[d->desktop], i = 0; it; it = g_list_next(it), ++i) { ObClient *c = it->data; if (client_normal(c)) { - GSList *acts; + GSList *acts = NULL; ObAction* act; ObMenuEntry *e; - ObClientIcon *icon; + const ObClientIcon *icon; empty = FALSE; @@ -65,7 +65,11 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data) act = action_from_string("Activate", OB_USER_ACTION_MENU_SELECTION); act->data.activate.any.c = c; - acts = g_slist_prepend(NULL, act); + acts = g_slist_append(acts, act); + act = action_from_string("Desktop", + OB_USER_ACTION_MENU_SELECTION); + act->data.desktop.desk = d->desktop; + acts = g_slist_append(acts, act); e = menu_add_normal(menu, i, (c->iconic ? c->icon_title : c->title), acts); @@ -80,11 +84,11 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data) if (empty) { /* no entries */ - GSList *acts; + GSList *acts = NULL; ObAction* act; act = action_from_string("Desktop", OB_USER_ACTION_MENU_SELECTION); act->data.desktop.desk = d->desktop; - acts = g_slist_prepend(NULL, act); + acts = g_slist_append(acts, act); menu_add_normal(menu, 0, _("Go there..."), acts); } }