Merge branch 'backport' into work

[chaz/openbox] / openbox / client_menu.c

diff --git a/openbox/client_menu.c b/openbox/client_menu.c
index 203d93aca1a381b161385feda9edc82e4d0e2b31..04f50e857fb31d6e34fe0d0c8cfbe989ec3ec473 100644 (file)
--- a/openbox/client_menu.c
+++ b/openbox/client_menu.c
@@ -22,12 +22,13 @@
 #include "config.h"
 #include "screen.h"
 #include "client.h"
+#include "client_menu.h"
 #include "openbox.h"
 #include "frame.h"
 #include "moveresize.h"
 #include "event.h"
-#include "prop.h"
 #include "gettext.h"
+#include "obt/prop.h"
 
 #include <glib.h>
 
@@ -140,7 +141,7 @@ static void client_menu_execute(ObMenuEntry *e, ObMenuFrame *f,
 
         screen_pointer_pos(&x, &y);
         moveresize_start(c, x, y, 0,
-                         prop_atoms.net_wm_moveresize_move_keyboard);
+                         OBT_PROP_ATOM(NET_WM_MOVERESIZE_MOVE_KEYBOARD));
         break;
     case CLIENT_RESIZE:
         /* this needs to grab the keyboard so hide the menu */
@@ -149,7 +150,7 @@ static void client_menu_execute(ObMenuEntry *e, ObMenuFrame *f,
 
         screen_pointer_pos(&x, &y);
         moveresize_start(c, x, y, 0,
-                         prop_atoms.net_wm_moveresize_size_keyboard);
+                         OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_KEYBOARD));
         break;
     case CLIENT_CLOSE:
         client_close(c);
@@ -352,7 +353,7 @@ static void client_menu_place(ObMenuFrame *frame, gint *x, gint *y,
     }
 }
 
-void client_menu_startup()
+void client_menu_startup(void)
 {
     ObMenu *menu;
     ObMenuEntry *e;