halfway through client changes but...

[chaz/openbox] / openbox / client_list_menu.c

diff --git a/openbox/client_list_menu.c b/openbox/client_list_menu.c
index acf9f071837204a20d005ecbb646e3ae0d9e25a0..4d4555f8c1182c0c5550bbc10391028b72f4a164 100644 (file)
--- a/openbox/client_list_menu.c
+++ b/openbox/client_list_menu.c
@@ -31,7 +31,8 @@
 
 static GSList *desktop_menus;
 
-typedef struct {
+typedef struct
+{
     guint desktop;
 } DesktopData;
 
@@ -52,7 +53,7 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data)
             GSList *acts;
             ObAction* act;
             ObMenuEntry *e;
-            ObClientIcon *icon;
+            const ObClientIcon *icon;
 
             empty = FALSE;
 
@@ -84,7 +85,7 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data)
         act = action_from_string("Desktop", OB_USER_ACTION_MENU_SELECTION);
         act->data.desktop.desk = d->desktop;
         acts = g_slist_prepend(NULL, act);
-        menu_add_normal(menu, 0, "Switch to...", acts);
+        menu_add_normal(menu, 0, _("Go there..."), acts);
     }
 }
 
@@ -92,12 +93,11 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data)
    when we make the actions! */
 static void desk_menu_execute(ObMenuEntry *self, guint state, gpointer data)
 {
-    GSList *it;
+    ObAction *a;
 
-    for (it = self->data.normal.actions; it; it = g_slist_next(it))
-    {
-        ObAction *act = it->data;
-        action_run(it->data, act->data.any.c, state);
+    if (self->data.normal.actions) {
+        a = self->data.normal.actions->data;
+        action_run(self->data.normal.actions, a->data.any.c, state);
     }
 }