summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2010-12-15 15:11:33 -0500
committerDana Jansens <danakj@orodu.net>2011-01-24 14:19:23 -0500
commit805f42e1d9051417bf6bc5fba53d2f86615ddef1 (patch)
tree55d2bb192e379ceea8afe587305fd71b340007b2
parent99ec7f6f7bc8a09a091de0d1ef81370bcd13887a (diff)
Fix compiling without sync extension present.
Make waiting_for_sync always present, but it is set to 0 (not waiting) if we aren't using sync.
-rw-r--r--openbox/moveresize.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/openbox/moveresize.c b/openbox/moveresize.c
index b0543f4a..3a98db37 100644
--- a/openbox/moveresize.c
+++ b/openbox/moveresize.c
@@ -64,8 +64,8 @@ static ObDirection edge_warp_dir = -1;
static gboolean edge_warp_odd = FALSE;
static guint edge_warp_timer = 0;
static ObDirection key_resize_edge = -1;
-#ifdef SYNC
static guint waiting_for_sync;
+#ifdef SYNC
static guint sync_timer = 0;
#endif
@@ -263,6 +263,7 @@ void moveresize_start(ObClient *c, gint x, gint y, guint b, guint32 cnr)
cur_h = start_ch;
moveresize_in_progress = TRUE;
+ waiting_for_sync = 0;
#ifdef SYNC
if (config_resize_redraw && !moving && obt_display_extension_sync &&
@@ -301,8 +302,6 @@ void moveresize_start(ObClient *c, gint x, gint y, guint b, guint32 cnr)
XSyncCADelta |
XSyncCAEvents,
&aa);
-
- waiting_for_sync = 0;
}
#endif
}