remove trailing whitespace

[chaz/openbox] / openbox / place.c

diff --git a/openbox/place.c b/openbox/place.c
index 37626231330c8637ca8ccb5f68d43a746241365b..6a97c36328e50b389a27489a94b1b9f1efda538f 100644 (file)
--- a/openbox/place.c
+++ b/openbox/place.c
@@ -86,7 +86,7 @@ static Rect **pick_head(ObClient *c)
 
         /* try on the client's desktop */
         for (it = c->group->members; it; it = g_slist_next(it)) {
-            ObClient *itc = it->data;            
+            ObClient *itc = it->data;
             if (itc != c &&
                 (itc->desktop == c->desktop ||
                  itc->desktop == DESKTOP_ALL || c->desktop == DESKTOP_ALL))
@@ -99,7 +99,7 @@ static Rect **pick_head(ObClient *c)
 
         /* try on all desktops */
         for (it = c->group->members; it; it = g_slist_next(it)) {
-            ObClient *itc = it->data;            
+            ObClient *itc = it->data;
             if (itc != c) {
                 add_choice(choice, client_monitor(it->data));
                 ob_debug("placement adding choice %d for group sibling on "
@@ -411,8 +411,6 @@ static gboolean place_per_app_setting(ObClient *client, gint *x, gint *y,
     else
         *x = screen->x + settings->position.x;
 
-    ob_debug("x %d settings %d\n", *x, settings->position.x);
-
     if (settings->center_y)
         *y = screen->y + screen->height / 2 - client->area.height / 2;
     else if (settings->opposite_y)
@@ -448,7 +446,7 @@ static gboolean place_transient_splash(ObClient *client, gint *x, gint *y)
                 }
             }
             if (!first) {
-                *x = ((r + 1 - l) - client->frame->area.width) / 2 + l; 
+                *x = ((r + 1 - l) - client->frame->area.width) / 2 + l;
                 *y = ((b + 1 - t) - client->frame->area.height) / 2 + t;
                 return TRUE;
             }
@@ -480,6 +478,7 @@ gboolean place_client(ObClient *client, gint *x, gint *y,
                       ObAppSettings *settings)
 {
     gboolean ret;
+    gboolean userplaced = FALSE;
 
     /* per-app settings override program specified position
      * but not user specified */
@@ -490,7 +489,7 @@ gboolean place_client(ObClient *client, gint *x, gint *y,
 
     /* try a number of methods */
     ret = place_transient_splash(client, x, y) ||
-        place_per_app_setting(client, x, y, settings) ||
+        (userplaced = place_per_app_setting(client, x, y, settings)) ||
         (config_place_policy == OB_PLACE_POLICY_MOUSE &&
          place_under_mouse(client, x, y)) ||
         place_nooverlap(client, x, y) ||
@@ -499,5 +498,5 @@ gboolean place_client(ObClient *client, gint *x, gint *y,
 
     /* get where the client should be */
     frame_frame_gravity(client->frame, x, y);
-    return ret;
+    return !userplaced;
 }