add the NONE cursor.

[chaz/openbox] / openbox / moveresize.c

diff --git a/openbox/moveresize.c b/openbox/moveresize.c
index 95e595872476af8dea1e0ae208d2257aae7356cc..8928a995d75d7bb55935e2e71e33dca204f3073e 100644 (file)
--- a/openbox/moveresize.c
+++ b/openbox/moveresize.c
@@ -28,22 +28,24 @@ static ObCorner lockcorner;
 
 static Popup *popup = NULL;
 
-static void client_dest(ObClient *c)
+static void client_dest(gpointer client)
 {
-    if (moveresize_client == c)
+    if (moveresize_client == client)
         moveresize_end(TRUE);    
 }
 
-void moveresize_startup()
+void moveresize_startup(gboolean reconfig)
 {
     popup = popup_new(FALSE);
 
-    client_add_destructor(client_dest);
+    if (!reconfig)
+        client_add_destructor(client_dest);
 }
 
-void moveresize_shutdown()
+void moveresize_shutdown(gboolean reconfig)
 {
-    client_remove_destructor(client_dest);
+    if (!reconfig)
+        client_remove_destructor(client_dest);
 
     popup_free(popup);
     popup = NULL;
@@ -137,7 +139,7 @@ void moveresize_start(ObClient *c, int x, int y, guint b, guint32 cnr)
 void moveresize_end(gboolean cancel)
 {
     grab_keyboard(FALSE);
-    grab_pointer(FALSE, None);
+    grab_pointer(FALSE, OB_CURSOR_NONE);
 
     popup_hide(popup);