X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fwindow.c;h=8b986b1b422f8a814b4a15c6931a7bfb4788ea27;hb=973507ff28b5d71433b3d0583e757fbc82b254c5;hp=521d9e2d4cd1908cb9bca909a07f5a1f7b0cdf2a;hpb=a95dc346fe7951dd48e41a41fcaafb6d872b0337;p=chaz%2Fopenbox

diff --git a/openbox/window.c b/openbox/window.c
index 521d9e2d..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,7 +25,7 @@ Window window_top(ObWindow *self)
 {
     switch (self->type) {
     case Window_Menu:
-        return ((ObMenu*)self)->frame;
+        return ((ObMenuFrame*)self)->window;
     case Window_Dock:
         return ((ObDock*)self)->frame;
     case Window_DockApp: