wow... this is a big commit...

[chaz/openbox] / openbox / client_list_combined_menu.c

diff --git a/openbox/client_list_combined_menu.c b/openbox/client_list_combined_menu.c
index a397c3cdd07593dbe5ce0b77f16e492b13478de7..c18c9c201d35216414d538181a3aec321932b5d7 100644 (file)
--- a/openbox/client_list_combined_menu.c
+++ b/openbox/client_list_combined_menu.c
@@ -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 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,7 +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(submenu, desk_menu_execute);
+    menu_set_execute_func(combined_menu, menu_execute);
 }
 
 void client_list_combined_menu_shutdown(gboolean reconfig)