merge r7699 from 3.4-working, (let per-app settings override program specified positi...
authorMikael Magnusson <mikachu@comhem.se>
Wed, 11 Jul 2007 00:39:14 +0000 (00:39 +0000)
committerMikael Magnusson <mikachu@comhem.se>
Wed, 11 Jul 2007 00:39:14 +0000 (00:39 +0000)
openbox/place.c

index 6a210b0..d290be3 100644 (file)
@@ -473,7 +473,11 @@ gboolean place_client(ObClient *client, gint *x, gint *y,
 {
     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 */