Merge branch 'backport'

[chaz/openbox] / openbox / keyboard.c

diff --git a/openbox/keyboard.c b/openbox/keyboard.c
index ac92f5f93ddc9290fc1a86ed92b76e224f54213a..0aade9ab25459e38f99517d91e27f677fd217d82 100644 (file)
--- a/openbox/keyboard.c
+++ b/openbox/keyboard.c
@@ -115,7 +115,7 @@ void keyboard_reset_chains(gint break_chroots)
     set_curpos(p);
 }
 
-void keyboard_unbind_all()
+void keyboard_unbind_all(void)
 {
     tree_destroy(keyboard_firstnode);
     keyboard_firstnode = NULL;
@@ -255,9 +255,8 @@ void keyboard_event(ObClient *client, const XEvent *e)
                     keyboard_reset_chains(0);
 
                 actions_run_acts(p->actions, OB_USER_ACTION_KEYBOARD_KEY,
-                                 e->xkey.time, e->xkey.state,
-                                 e->xkey.x_root, e->xkey.y_root,
-                                 OB_FRAME_CONTEXT_NONE, client);
+                                 e->xkey.state, e->xkey.x_root, e->xkey.y_root,
+                                 0, OB_FRAME_CONTEXT_NONE, client);
             }
             break;
         }
@@ -268,7 +267,7 @@ void keyboard_event(ObClient *client, const XEvent *e)
 void keyboard_startup(gboolean reconfig)
 {
     grab_keys(TRUE);
-    popup = popup_new(FALSE);
+    popup = popup_new();
     popup_set_text_align(popup, RR_JUSTIFY_CENTER);
 }