merge r7699 from 3.4-working, (let per-app settings override program specified positi...

diff --git a/openbox/place.c b/openbox/place.c
index 6a210b0..d290be3 100644 (file)
--- a/openbox/place.c
+++ b/openbox/place.c
@@ -473,7 +473,11 @@ gboolean place_client(ObClient *client, gint *x, gint *y,
 {
     gboolean ret;
 
 {
     gboolean ret;
 

-    if (client->positioned)
+    /* per-app settings override program specified position
+     * but not user specified */
+    if ((client->positioned & USPosition) ||
+        ((client->positioned & PPosition) && !(settings && settings->pos_given))
+        )

         return FALSE;
 
     /* try a number of methods */
         return FALSE;
 
     /* try a number of methods */