changes to the timer api, pass the timer to the callback function.

add a desktop-switch popup with the desktop's name

2 files changed, 3 insertions, 3 deletions

diff --git a/plugins/keyboard/keyboard.c b/plugins/keyboard/keyboard.c
index a583a2e6..1597b063 100644
--- a/plugins/keyboard/keyboard.c
+++ b/plugins/keyboard/keyboard.c
@@ -121,7 +121,7 @@ static void reset_chains()
     }
 }
 
-static void chain_timeout(void *data)
+static void chain_timeout(ObTimer *t, void *data)
 {
     reset_chains();
 }
diff --git a/plugins/menu/timed_menu.c b/plugins/menu/timed_menu.c
index 3bf820a7..844a5641 100644
--- a/plugins/menu/timed_menu.c
+++ b/plugins/menu/timed_menu.c
@@ -124,7 +124,7 @@ void timed_menu_read_pipe(int fd, void *d)
     }
 }
 
-void timed_menu_timeout_handler(void *d)
+void timed_menu_timeout_handler(ObTimer *t, void *d)
 {
     ObMenu *data = d;
     if (!data->shown && TIMED_MENU_DATA(data)->fd == -1) {
@@ -231,7 +231,7 @@ void *plugin_create(PluginMenuCreateData *data)
     
     m->plugin_data = (void *)d;
 
-    timed_menu_timeout_handler(m);
+    timed_menu_timeout_handler(NULL, m);
     return (void *)m;
 }