set the default icon onto windows which don't provide one

[chaz/openbox] / openbox / moveresize.c

diff --git a/openbox/moveresize.c b/openbox/moveresize.c
index 39fdd45daefaba48a5f67692be79c3bb5764305c..6db822c3f9d3b0d4a3e6bb7303fa9e1782b60369 100644 (file)
--- a/openbox/moveresize.c
+++ b/openbox/moveresize.c
@@ -174,8 +174,8 @@ void moveresize_start(ObClient *c, gint x, gint y, guint b, guint32 cnr)
         g_assert_not_reached();
 
 #ifdef SYNC
-    if (!moving && extensions_shape && moveresize_client->sync_request &&
-        moveresize_client->sync_counter)
+    if (config_resize_redraw && !moving && extensions_shape &&
+        moveresize_client->sync_request && moveresize_client->sync_counter)
     {
         /* Initialize values for the resize syncing, and create an alarm for
            the client's xsync counter */
@@ -270,31 +270,30 @@ static void do_move(gboolean resist)
 static void do_resize()
 {
 #ifdef SYNC
-    gint x, y, w, h, lw, lh;
-
-    /* see if it is actually going to resize */
-    x = moveresize_client->area.x;
-    y = moveresize_client->area.y;
-    w = cur_x;
-    h = cur_y;
-    client_try_configure(moveresize_client, lockcorner, &x, &y, &w, &h,
-                         &lw, &lh, TRUE);
-    if (w == moveresize_client->area.width &&
-        h == moveresize_client->area.height)
-    {
-        return;
-    }
-
-    if (extensions_sync && moveresize_client->sync_request &&
-        moveresize_client->sync_counter)
+    if (config_resize_redraw && extensions_sync &&
+        moveresize_client->sync_request && moveresize_client->sync_counter)
     {
         XEvent ce;
         XSyncValue val;
+        gint x, y, w, h, lw, lh;
 
         /* are we already waiting for the sync counter to catch up? */
         if (waiting_for_sync)
             return;
 
+        /* see if it is actually going to resize */
+        x = moveresize_client->area.x;
+        y = moveresize_client->area.y;
+        w = cur_x;
+        h = cur_y;
+        client_try_configure(moveresize_client, lockcorner, &x, &y, &w, &h,
+                             &lw, &lh, TRUE);
+        if (w == moveresize_client->area.width &&
+            h == moveresize_client->area.height)
+        {
+            return;
+        }
+
         /* increment the value we're waiting for */
         ++moveresize_client->sync_counter_value;
         XSyncIntToValue(&val, moveresize_client->sync_counter_value);