X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient_list_combined_menu.c;h=c18c9c201d35216414d538181a3aec321932b5d7;hb=c5d2a9bc98fb7d1ed85c69fc3007ab36b9fd96d5;hp=04b750c15357f54ad27816bc69315b94f21ebbb1;hpb=f43067b77244cc002c5bc5bec0676ae213164724;p=chaz%2Fopenbox

diff --git a/openbox/client_list_combined_menu.c b/openbox/client_list_combined_menu.c
index 04b750c1..c18c9c20 100644
--- a/openbox/client_list_combined_menu.c
+++ b/openbox/client_list_combined_menu.c
@@ -58,15 +58,15 @@ static void self_update(ObMenuFrame *frame, gpointer data)
                 }
 
                 act = action_from_string("Activate",
-                        OB_USER_ACTION_MENU_SELECTION);
+                                         OB_USER_ACTION_MENU_SELECTION);
                 act->data.activate.any.c = c;
                 acts = g_slist_append(acts, act);
                 act = action_from_string("Desktop",
-                        OB_USER_ACTION_MENU_SELECTION);
+                                         OB_USER_ACTION_MENU_SELECTION);
                 act->data.desktop.desk = desktop;
                 acts = g_slist_append(acts, act);
-                e = menu_add_normal(menu, i,
-                        (c->iconic ? c->icon_title : c->title), acts);
+                e = menu_add_normal(menu, i, (c->iconic ?
+                                              c->icon_title : c->title), acts);
 
                 if (config_menu_client_list_icons
                         && (icon = client_icon(c, 32, 32))) {
@@ -84,13 +84,14 @@ static void self_update(ObMenuFrame *frame, gpointer data)
 
 /* executes it using the client in the actions, since we set that
    when we make the actions! */
-static void desk_menu_execute(ObMenuEntry *self, guint state, gpointer data)
+static void menu_execute(ObMenuEntry *self, guint state, gpointer data,
+                         Time time)
 {
     ObAction *a;
 
     if (self->data.normal.actions) {
         a = self->data.normal.actions->data;
-        action_run(self->data.normal.actions, a->data.any.c, state);
+        action_run(self->data.normal.actions, a->data.any.c, state, time);
     }
 }
 
@@ -118,6 +119,7 @@ void client_list_combined_menu_startup(gboolean reconfig)
 
     combined_menu = menu_new(MENU_NAME, _("Windows"), NULL);
     menu_set_update_func(combined_menu, self_update);
+    menu_set_execute_func(combined_menu, menu_execute);
 }
 
 void client_list_combined_menu_shutdown(gboolean reconfig)