further work to r6205. make the disabled titlebar buttons hide if they won't move...

[chaz/openbox] / openbox / config.c

diff --git a/openbox/config.c b/openbox/config.c
index d6adb9751331c7de6205ad7759ce8fabb2840976..e94827036f7c17cebab28ec9d3b50a4def98c030 100644 (file)
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -215,6 +215,7 @@ static void parse_per_app_settings(ObParseInst *i, xmlDocPtr doc,
                         gint i = parse_int(doc, n);
                         if (i > 0)
                             settings->desktop = i;
+                    }
                     g_free(s);
                 } else
                     settings->desktop = 0;
@@ -465,8 +466,15 @@ static void parse_theme(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
         g_free(c);
     }
     if ((n = parse_find_node("titleLayout", node))) {
+        gchar *c, *d;
+
         g_free(config_title_layout);
         config_title_layout = parse_string(doc, n);
+
+        /* replace duplicates with spaces */
+        for (c = config_title_layout; *c != '\0'; ++c)
+            for (d = c+1; *d != '\0'; ++d)
+                if (*c == *d) *d = ' ';
     }
     if ((n = parse_find_node("keepBorder", node)))
         config_theme_keepborder = parse_bool(doc, n);