summaryrefslogtreecommitdiff
path: root/openbox/client_menu.c
diff options
context:
space:
mode:
Diffstat (limited to 'openbox/client_menu.c')
-rw-r--r--openbox/client_menu.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/openbox/client_menu.c b/openbox/client_menu.c
index 6c3147ae..e70e6c0f 100644
--- a/openbox/client_menu.c
+++ b/openbox/client_menu.c
@@ -27,8 +27,8 @@
#include "frame.h"
#include "moveresize.h"
#include "event.h"
-#include "prop.h"
#include "gettext.h"
+#include "obt/prop.h"
#include <glib.h>
@@ -118,7 +118,8 @@ static void client_menu_execute(ObMenuEntry *e, ObMenuFrame *f,
gint x, y;
gulong ignore_start;
- g_assert(c);
+ if (!c)
+ return;
if (!config_focus_under_mouse)
ignore_start = event_start_ignore_all_enters();
@@ -150,7 +151,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 */
@@ -159,7 +160,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);