Merge branch 'backport' into work

[chaz/openbox] / openbox / window.c

diff --git a/openbox/window.c b/openbox/window.c
index 88a727dfa583589e885c62678e5ecabef61cecb3..b90dc5093836c68db66136ad10e46be2c7da176d 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;
@@ -193,7 +196,7 @@ void window_manage(Window win)
             dock_manage(icon_win, win);
         }
         else
-            client_manage(win);
+            client_manage(win, NULL);
     }
     else {
         grab_server(FALSE);