Merge branch 'backport' into work

[chaz/openbox] / openbox / window.c

diff --git a/openbox/window.c b/openbox/window.c
index c8951741bf44fa72713a54b697f713943eeb286d..19b362edd14e26fda80d5a1ee6fc5c2d1e680e65 100644 (file)
--- a/openbox/window.c
+++ b/openbox/window.c
@@ -74,8 +74,11 @@ ObStackingLayer window_layer(ObWindow *self)
         return ((ObClient*)self)->layer;
     case OB_WINDOW_CLASS_MENUFRAME:
     case OB_WINDOW_CLASS_INTERNAL:
-    case OB_WINDOW_CLASS_PROMPT:
         return OB_STACKING_LAYER_INTERNAL;
+    case OB_WINDOW_CLASS_PROMPT:
+        /* not used directly for stacking, prompts are managed as clients */
+        g_assert_not_reached();
+        break;
     }
     g_assert_not_reached();
     return None;
@@ -159,7 +162,7 @@ void window_manage(Window win)
         XCheckTypedWindowEvent(obt_display, win, UnmapNotify, &e))
     {
         XPutBackEvent(obt_display, &e);
-        ob_debug("Trying to manage unmapped window. Aborting that.\n");
+        ob_debug("Trying to manage unmapped window. Aborting that.");
         no_manage = TRUE;
     }
 
@@ -184,7 +187,7 @@ void window_manage(Window win)
 
     if (!no_manage) {
         if (attrib.override_redirect) {
-            ob_debug("not managing override redirect window 0x%x\n", win);
+            ob_debug("not managing override redirect window 0x%x", win);
             grab_server(FALSE);
         }
         else if (is_dockapp) {
@@ -197,7 +200,7 @@ void window_manage(Window win)
     }
     else {
         grab_server(FALSE);
-        ob_debug("FAILED to manage window 0x%x\n", win);
+        ob_debug("FAILED to manage window 0x%x", win);
     }
 }