X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fwindow.c;h=8b986b1b422f8a814b4a15c6931a7bfb4788ea27;hb=3ce8f836749c9f74f6888251f0a7f2ff601830c0;hp=ed139b64e04483030e908e0bff9ee16deeb1377d;hpb=b77e40e1c7710323aa59a778338d8e18b591f718;p=chaz%2Fopenbox

diff --git a/openbox/window.c b/openbox/window.c
index ed139b64..8b986b1b 100644
--- a/openbox/window.c
+++ b/openbox/window.c
@@ -1,5 +1,5 @@
 #include "window.h"
-#include "menu.h"
+#include "menuframe.h"
 #include "config.h"
 #include "dock.h"
 #include "client.h"
@@ -7,13 +7,17 @@
 
 GHashTable *window_map;
 
-void window_startup()
+void window_startup(gboolean reconfig)
 {
+    if (reconfig) return;
+
     window_map = g_hash_table_new(g_int_hash, g_int_equal);
 }
 
-void window_shutdown()
+void window_shutdown(gboolean reconfig)
 {
+    if (reconfig) return;
+
     g_hash_table_destroy(window_map);
 }
 
@@ -21,15 +25,15 @@ Window window_top(ObWindow *self)
 {
     switch (self->type) {
     case Window_Menu:
-        return ((Menu*)self)->frame;
+        return ((ObMenuFrame*)self)->window;
     case Window_Dock:
-        return ((Dock*)self)->frame;
+        return ((ObDock*)self)->frame;
     case Window_DockApp:
         /* not to be used for stacking */
         g_assert_not_reached();
         break;
     case Window_Client:
-        return ((Client*)self)->frame->window;
+        return ((ObClient*)self)->frame->window;
     case Window_Internal:
         return ((InternalWindow*)self)->win;
     }
@@ -41,7 +45,7 @@ Window window_layer(ObWindow *self)
 {
     switch (self->type) {
     case Window_Menu:
-        return Layer_Internal;
+        return OB_STACKING_LAYER_INTERNAL;
     case Window_Dock:
         return config_dock_layer;
     case Window_DockApp:
@@ -49,9 +53,9 @@ Window window_layer(ObWindow *self)
         g_assert_not_reached();
         break;
     case Window_Client:
-        return ((Client*)self)->layer;
+        return ((ObClient*)self)->layer;
     case Window_Internal:
-        return Layer_Internal;
+        return OB_STACKING_LAYER_INTERNAL;
     }
     g_assert_not_reached();
     return None;