From: Mikael Magnusson <mikachu@comhem.se>
Date: Sat, 19 Aug 2006 17:50:12 +0000 (+0000)
Subject: forgot to check if perapp settings said to put window on all desktops
X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;h=39f6b8ca715b97b9ef57fe0ac23b90b6bd1c8ae3;p=chaz%2Fopenbox

forgot to check if perapp settings said to put window on all desktops
---

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