From: Mikael Magnusson <mikachu@comhem.se>
Date: Wed, 11 Jul 2007 00:39:14 +0000 (+0000)
Subject: merge r7699 from 3.4-working, (let per-app settings override program specified positi... 
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=4193404acf45ce591ac2ee0b7a27a5bf52b4b4c6;p=chaz%2Fopenbox

merge r7699 from 3.4-working, (let per-app settings override program specified position but not user specified)
---

diff --git a/openbox/place.c b/openbox/place.c
index 6a210b0f..d290be3d 100644
--- a/openbox/place.c
+++ b/openbox/place.c
@@ -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 */