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

This commit is contained in:
Mikael Magnusson 2007-07-11 00:39:14 +00:00
parent f39cc88fc4
commit 4193404acf

View 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 */