indenting

[chaz/openbox] / openbox / screen.c

diff --git a/openbox/screen.c b/openbox/screen.c
index 9ce25dde546da3669067dc0996ad73ce88582bff..c7127214b599123c39d7611d200f5af45b1290b5 100644 (file)
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -28,6 +28,7 @@
 #include "screen.h"
 #include "client.h"
 #include "frame.h"
+#include "event.h"
 #include "focus.h"
 #include "popup.h"
 #include "extensions.h"
@@ -453,8 +454,9 @@ void screen_set_desktop(guint num)
         }
     }
 
-    if (!focus_client)
-        focus_fallback(OB_FOCUS_FALLBACK_NOFOCUS);
+    event_ignore_queued_enters();
+
+    focus_fallback(OB_FOCUS_FALLBACK_NOFOCUS);
 }
 
 static void get_row_col(guint d, guint *r, guint *c)
@@ -862,15 +864,15 @@ void screen_install_colormap(ObClient *client, gboolean install)
        else
            XUninstallColormap(RrDisplay(ob_rr_inst), RrColormap(ob_rr_inst));
     } else {
-       if (XGetWindowAttributes(ob_display, client->window, &wa) &&
+        if (XGetWindowAttributes(ob_display, client->window, &wa) &&
             wa.colormap != None) {
             xerror_set_ignore(TRUE);
-           if (install)
-               XInstallColormap(RrDisplay(ob_rr_inst), wa.colormap);
-           else
-               XUninstallColormap(RrDisplay(ob_rr_inst), wa.colormap);
+            if (install)
+                XInstallColormap(RrDisplay(ob_rr_inst), wa.colormap);
+            else
+                XUninstallColormap(RrDisplay(ob_rr_inst), wa.colormap);
             xerror_set_ignore(FALSE);
-       }
+        }
     }
 }