Merge branch 'backport' into work

[chaz/openbox] / openbox / focus.h

diff --git a/openbox/focus.h b/openbox/focus.h
index b8f899940d72047ea1c5fb9c79f4d0f5a369c0a8..80ce3a38728dcfd29586e190336da1690eeb52de 100644 (file)
--- a/openbox/focus.h
+++ b/openbox/focus.h
@@ -41,7 +41,7 @@ void focus_shutdown(gboolean reconfig);
 void focus_set_client(struct _ObClient *client);
 
 /*! Focus nothing, but let keyboard events be caught. */
-void focus_nothing();
+void focus_nothing(void);
 
 /*! Call this when you need to focus something! */
 struct _ObClient* focus_fallback(gboolean allow_refocus,
@@ -69,6 +69,7 @@ gboolean focus_valid_target(struct _ObClient *ft,
                             gboolean iconic_windows,
                             gboolean all_desktops,
                             gboolean dock_windows,
-                            gboolean desktop_windows);
+                            gboolean desktop_windows,
+                            gboolean user_request);
 
 #endif