Merge branch 'backport'

[chaz/openbox] / openbox / focus_cycle.h

diff --git a/openbox/focus_cycle.h b/openbox/focus_cycle.h
index 3fecc9e42acd04258a56e085106e2703e8f84698..6e1c2c9dbad183f990ff8fb70addc494bd63a3a5 100644 (file)
--- a/openbox/focus_cycle.h
+++ b/openbox/focus_cycle.h
@@ -37,10 +37,15 @@ void focus_cycle_shutdown(gboolean reconfig);
 struct _ObClient* focus_cycle(gboolean forward, gboolean all_desktops,
                               gboolean dock_windows, gboolean desktop_windows,
                               gboolean linear, gboolean interactive,
-                              gboolean dialog, gboolean done, gboolean cancel);
-void focus_directional_cycle(ObDirection dir, gboolean dock_windows,
-                             gboolean desktop_windows, gboolean interactive,
-                             gboolean dialog, gboolean done, gboolean cancel);
+                              gboolean showbar, gboolean dialog,
+                              gboolean done, gboolean cancel);
+struct _ObClient* focus_directional_cycle(ObDirection dir,
+                                          gboolean dock_windows,
+                                          gboolean desktop_windows,
+                                          gboolean interactive,
+                                          gboolean showbar,
+                                          gboolean dialog,
+                                          gboolean done, gboolean cancel);
 
 void focus_cycle_stop(struct _ObClient *ifclient);