don't use XPutBackEvent and mess up timestamp order in the event queue

[chaz/openbox] / openbox / client_list_menu.c

diff --git a/openbox/client_list_menu.c b/openbox/client_list_menu.c
index 2d62c3e9ff05707b6fcac292f4c3b187584b149b..b47ead02b30ed0fb8831152a1de6bbbba2b57318 100644 (file)
--- a/openbox/client_list_menu.c
+++ b/openbox/client_list_menu.c
@@ -55,7 +55,7 @@ static gboolean desk_menu_update(ObMenuFrame *frame, gpointer data)
     for (it = focus_order; it; it = g_list_next(it)) {
         ObClient *c = it->data;
         if (focus_valid_target(c, d->desktop,
-                               TRUE, TRUE, FALSE, FALSE, FALSE, FALSE)) {
+                               TRUE, TRUE, FALSE, TRUE, FALSE, FALSE, FALSE)) {
             ObMenuEntry *e;
 
             empty = FALSE;
@@ -116,7 +116,7 @@ static void desk_menu_destroy(ObMenu *menu, gpointer data)
 {
     DesktopData *d = data;
 
-    g_free(d);
+    g_slice_free(DesktopData, d);
 
     desktop_menus = g_slist_remove(desktop_menus, menu);
 }
@@ -136,7 +136,7 @@ static gboolean self_update(ObMenuFrame *frame, gpointer data)
     for (i = 0; i < screen_num_desktops; ++i) {
         ObMenu *submenu;
         gchar *name = g_strdup_printf("%s-%u", MENU_NAME, i);
-        DesktopData *ddata = g_new(DesktopData, 1);
+        DesktopData *ddata = g_slice_new(DesktopData);
 
         ddata->desktop = i;
         submenu = menu_new(name, screen_desktop_names[i], FALSE, ddata);