X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=plugins%2Fmenu%2Fclient_menu.c;h=9edb392930d181b71eb380ea82bf1e4b4acb1339;hb=3c92311b3c88e7da28aabe59d26c10a18c096399;hp=931ee79dc47bcb730741fec5ff3742c2e49fc9cf;hpb=d03c1afac676c612c2d70584ceb4101607ac4c7e;p=chaz%2Fopenbox

diff --git a/plugins/menu/client_menu.c b/plugins/menu/client_menu.c
index 931ee79d..9edb3929 100644
--- a/plugins/menu/client_menu.c
+++ b/plugins/menu/client_menu.c
@@ -1,14 +1,14 @@
-#include <glib.h>
-
+#include "kernel/debug.h"
 #include "kernel/menu.h"
 #include "kernel/screen.h"
 #include "kernel/client.h"
 #include "kernel/openbox.h"
-
 #include "kernel/frame.h"
 
 #include "render/theme.h"
 
+#include <glib.h>
+
 static char *PLUGIN_NAME = "client_menu";
 
 static ObMenu *send_to_menu;
@@ -42,7 +42,7 @@ void client_send_to_update(ObMenu *self)
 
     if (it != NULL || i != screen_num_desktops) {
         menu_clear(self);
-        g_message("update");
+        ob_debug("update\n");
         for (i = 0; i < screen_num_desktops; ++i) {
             ObMenuEntry *e;
             Action *a = action_from_string("sendtodesktop");
@@ -52,13 +52,14 @@ void client_send_to_update(ObMenu *self)
             menu_add_entry(self, e);
         }
         
-        menu_render_full(self);
+        self->update(self);
     }
 }
 
 void client_menu_show(ObMenu *self, int x, int y, ObClient *client)
 {
-    guint i, newy, newx;
+    guint i;
+    gint newy, newx;
     Rect *a = NULL;
 
     g_assert(!self->invalid);
@@ -101,7 +102,7 @@ void plugin_destroy (ObMenu *m)
 void *plugin_create() /* TODO: need config */
 {
     ObMenu *m = menu_new_full(NULL, "client-menu", NULL,
-                            client_menu_show, NULL);
+                            client_menu_show, NULL, NULL, NULL, NULL);
     m->plugin = PLUGIN_NAME;
     menu_add_entry(m, menu_entry_new_submenu("Send To Workspace",
                                              send_to_menu));
@@ -143,7 +144,7 @@ void plugin_startup()
     ObMenu *t;
     /* create a Send To Workspace ObMenu */
     send_to_menu = menu_new_full(NULL, "send-to-workspace",
-                          NULL, NULL, client_send_to_update);
+                          NULL, NULL, client_send_to_update, NULL, NULL, NULL);
     
     layer_menu = menu_new(NULL, "layer", NULL);
     menu_add_entry(layer_menu, menu_entry_new("Top Layer",