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

[chaz/openbox] / openbox / focus.c

diff --git a/openbox/focus.c b/openbox/focus.c
index dfa9c42dc93ee648157820906d78cc03d8d2b3ab..1642261dac685967365b8aaf3889c79980498436 100644 (file)
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -19,11 +19,11 @@
 #include <assert.h>
 
 ObClient *focus_client;
-GList **focus_order = NULL; /* these lists are created when screen_startup
-                               sets the number of desktops */
+GList **focus_order; /* these lists are created when screen_startup
+                        sets the number of desktops */
 
-static ObClient *focus_cycle_target = NULL;
-static Popup *focus_cycle_popup = NULL;
+static ObClient *focus_cycle_target;
+static Popup *focus_cycle_popup;
 
 void focus_startup()
 {
@@ -240,7 +240,7 @@ static void popup_cycle(ObClient *c, gboolean show)
 */
         /* XXX the size and the font extents need to be related on some level
          */
-        popup_size(focus_cycle_popup, 320, 48);
+        popup_size(focus_cycle_popup, POPUP_WIDTH, POPUP_HEIGHT);
 
         /* use the transient's parent's title/icon */
         while (p->transient_for && p->transient_for != OB_TRAN_GROUP)