summaryrefslogtreecommitdiff
path: root/openbox
diff options
context:
space:
mode:
authorMikael Magnusson <mikachu@comhem.se>2006-08-19 17:50:12 +0000
committerMikael Magnusson <mikachu@comhem.se>2006-08-19 17:50:12 +0000
commit39f6b8ca715b97b9ef57fe0ac23b90b6bd1c8ae3 (patch)
treeee0fdaf3aa6af73a068d16dc609da74a6e2a3ec3 /openbox
parent34269a34e14aaf0339b3687a713415dff4ad36d2 (diff)
forgot to check if perapp settings said to put window on all desktops
Diffstat (limited to 'openbox')
-rw-r--r--openbox/client.c3
-rw-r--r--openbox/config.c1
2 files changed, 3 insertions, 1 deletions
diff --git a/openbox/client.c b/openbox/client.c
index 060548bf..08b09c93 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -359,7 +359,8 @@ void client_manage(Window window)
if (settings->fullscreen != -1)
client_fullscreen(self, !!settings->fullscreen, TRUE);
- if (settings->desktop < screen_num_desktops)
+ if (settings->desktop < screen_num_desktops
+ || settings->desktop == DESKTOP_ALL)
client_set_desktop(self, settings->desktop, FALSE);
if (settings->layer > -2 && settings->layer < 2)
diff --git a/openbox/config.c b/openbox/config.c
index e8e4edff..e0cb1819 100644
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -133,6 +133,7 @@ static void parse_per_app_settings(ObParseInst *i, xmlDocPtr doc,
settings->name = name;
else
settings->name = NULL;
+
if (class_set)
settings->class = class;
else