make ob_state a function so it cant be changed outside of openbox.c

[chaz/openbox] / openbox / event.c

diff --git a/openbox/event.c b/openbox/event.c
index cb8babf078d2a059de071a728e0d53c8ccfd654b..6d74a27d2eb15f4f923667080d0463615cf410a2 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -486,7 +486,7 @@ static void event_process(XEvent *e)
        event_handle_dockapp(dockapp, e);
     else if (dock)
        event_handle_dock(dock, e);
-    else if (window == ob_root)
+    else if (window == RootWindow(ob_display, ob_screen))
        event_handle_root(e);
     else if (e->type == MapRequest)
        client_manage(window);
@@ -650,7 +650,7 @@ static void event_handle_client(ObClient *client, XEvent *e)
        break;
     case EnterNotify:
         if (client_normal(client)) {
-            if (ob_state == OB_STATE_STARTING) {
+            if (ob_state() == OB_STATE_STARTING) {
                 /* move it to the top of the focus order */
                 guint desktop = client->desktop;
                 if (desktop == DESKTOP_ALL) desktop = screen_desktop;