Merge branch 'backport' into work

[chaz/openbox] / openbox / actions / move.c

diff --git a/openbox/actions/move.c b/openbox/actions/move.c
index bf140c31dd8f8ca666902af0761b303b32167f61..ddd3f59af7d1a76fb9144132c933e0612e112f59 100644 (file)
--- a/openbox/actions/move.c
+++ b/openbox/actions/move.c
@@ -1,10 +1,10 @@
 #include "openbox/actions.h"
-#include "openbox/prop.h"
 #include "openbox/moveresize.h"
+#include "obt/prop.h"
 
 static gboolean run_func(ObActionsData *data, gpointer options);
 
-void action_move_startup()
+void action_move_startup(void)
 {
     actions_register("Move",
                      NULL, NULL,
@@ -19,8 +19,8 @@ static gboolean run_func(ObActionsData *data, gpointer options)
         guint32 corner;
 
         corner = data->button != 0 ?
-            prop_atoms.net_wm_moveresize_move :
-            prop_atoms.net_wm_moveresize_move_keyboard;
+            OBT_PROP_ATOM(NET_WM_MOVERESIZE_MOVE) :
+            OBT_PROP_ATOM(NET_WM_MOVERESIZE_MOVE_KEYBOARD);
 
         moveresize_start(data->client, data->x, data->y, data->button, corner);
     }