X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenu.c;h=868293c68cd9550b4c6594111834067237885b32;hb=d34741f58c0732e7c720bbe7aa4cd063f9db92d1;hp=c1d1138be270ad8652a0bc9501f7336b5eec0828;hpb=1ffd89672fa62cdf2c9e707fdf53e6d8a0080b6f;p=chaz%2Fopenbox

diff --git a/openbox/menu.c b/openbox/menu.c
index c1d1138b..868293c6 100644
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -1,6 +1,7 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    menu.c for the Openbox window manager
+   Copyright (c) 2006        Mikael Magnusson
    Copyright (c) 2003        Ben Jansens
 
    This program is free software; you can redistribute it and/or modify
@@ -29,6 +30,7 @@
 #include "misc.h"
 #include "client_menu.h"
 #include "client_list_menu.h"
+#include "client_list_combined_menu.h"
 #include "parser/parse.h"
 
 typedef struct _ObMenuParseState ObMenuParseState;
@@ -69,7 +71,8 @@ void menu_startup(gboolean reconfig)
     menu_hash = g_hash_table_new_full(g_str_hash, g_str_equal, NULL,
                                       (GDestroyNotify)menu_destroy_hash_value);
 
-    client_list_menu_startup();
+    client_list_menu_startup(reconfig);
+    client_list_combined_menu_startup(reconfig);
     client_menu_startup();
 
     menu_parse_inst = parse_startup();
@@ -110,6 +113,9 @@ void menu_shutdown(gboolean reconfig)
     parse_shutdown(menu_parse_inst);
     menu_parse_inst = NULL;
 
+    client_list_menu_shutdown(reconfig);
+    client_list_combined_menu_shutdown(reconfig);
+
     menu_frame_hide_all();
     g_hash_table_destroy(menu_hash);
     menu_hash = NULL;
@@ -307,7 +313,7 @@ void menu_show(gchar *name, gint x, gint y, ObClient *client)
         menu_frame_move(frame, x, y);
     } else
         menu_frame_move(frame,
-                        x - ob_rr_theme->bwidth, y - ob_rr_theme->bwidth);
+                        x - ob_rr_theme->mbwidth, y - ob_rr_theme->mbwidth);
     for (i = 0; i < screen_num_monitors; ++i) {
         Rect *a = screen_physical_area_monitor(i);
         if (RECT_CONTAINS(*a, x, y)) {