off by one caused clients to be resized a little during a move

[chaz/openbox] / openbox / client_list_menu.c

diff --git a/openbox/client_list_menu.c b/openbox/client_list_menu.c
index cf3b8d5de772111896f73f784c89fb4edb72a116..2dab84fc32c38991b5226fddd07d31132fcaf500 100644 (file)
--- a/openbox/client_list_menu.c
+++ b/openbox/client_list_menu.c
@@ -1,10 +1,10 @@
-#include "kernel/openbox.h"
-#include "kernel/menu.h"
-#include "kernel/menuframe.h"
-#include "kernel/action.h"
-#include "kernel/screen.h"
-#include "kernel/client.h"
-#include "kernel/focus.h"
+#include "openbox.h"
+#include "menu.h"
+#include "menuframe.h"
+#include "action.h"
+#include "screen.h"
+#include "client.h"
+#include "focus.h"
 #include "gettext.h"
 
 #include <glib.h>
@@ -17,14 +17,13 @@ typedef struct {
     guint desktop;
 } DesktopData;
 
-void plugin_setup_config() { }
-
 static void desk_menu_update(ObMenuFrame *frame, gpointer data)
 {
     ObMenu *menu = frame->menu;
     DesktopData *d = data;
     GList *it;
     gint i;
+    gboolean icons = FALSE;
 
     menu_clear_entries(menu);
 
@@ -36,8 +35,13 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data)
             ObMenuEntry *e;
             ObClientIcon *icon;
 
+            if (!icons && c->iconic) {
+                icons = TRUE;
+                menu_add_separator(menu, -1);
+            }
+
             act = action_from_string("activate");
-            act->data.activate.c = c;
+            act->data.activate.any.c = c;
             acts = g_slist_prepend(NULL, act);
             e = menu_add_normal(menu, i,
                                 (c->iconic ? c->icon_title : c->title), acts);
@@ -70,6 +74,8 @@ static void desk_menu_destroy(ObMenu *menu, gpointer data)
     DesktopData *d = data;
 
     g_free(d);
+
+    desktop_menus = g_slist_remove(desktop_menus, menu);
 }
 
 static void self_update(ObMenuFrame *frame, gpointer data)