]> Dogcows Code - chaz/openbox/blobdiff - openbox/screen.c
prefix the Timer->ObTimer and TimeoutHandler->ObTimeoutHandler shitz
[chaz/openbox] / openbox / screen.c
index c9b05a514013aba8eab10346a118224c012e1a5a..a83c5710ea529f2b3ad7ab79c419c3effaea8251 100644 (file)
@@ -46,7 +46,7 @@ static Window support_window = None;
 #ifdef USE_LIBSN
 static SnMonitorContext *sn_context;
 static int sn_busy_cnt;
-static Timer *sn_timer = NULL;
+static ObTimer *sn_timer = NULL;
 
 static void sn_event_func(SnMonitorEvent *event, void *data);
 #endif
@@ -346,9 +346,13 @@ void screen_set_desktop(guint num)
     /* focus the last focused window on the desktop, and ignore enter events
        from the switch so it doesnt mess with the focus */
     while (XCheckTypedEvent(ob_display, EnterNotify, &e));
+#ifdef DEBUG_FOCUS
     g_message("switch fallback");
-    focus_fallback(Fallback_Desktop);
+#endif
+    focus_fallback(OB_FOCUS_FALLBACK_DESKTOP);
+#ifdef DEBUG_FOCUS
     g_message("/switch fallback");
+#endif
 
     dispatch_ob(Event_Ob_Desktop, num, old);
 }
@@ -489,7 +493,7 @@ void screen_show_desktop(gboolean show)
                 client_focus(it->data))
                 break;
     } else {
-        focus_fallback(Fallback_NoFocus);
+        focus_fallback(OB_FOCUS_FALLBACK_NOFOCUS);
     }
 
     show = !!show; /* make it boolean */
This page took 0.024559 seconds and 4 git commands to generate.