kill the hideDisabled option

[chaz/openbox] / openbox / config.c

diff --git a/openbox/config.c b/openbox/config.c
index 18db15f837e2580b43d024b144f301a9591281c1..99e35b5ada0d57e92ba2e7d1a3e3cb6fd71dcd50 100644 (file)
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -38,7 +38,6 @@ ObPlacePolicy config_place_policy;
 
 gchar   *config_theme;
 gboolean config_theme_keepborder;
-gboolean config_theme_hidedisabled;
 
 gchar   *config_title_layout;
 
@@ -466,13 +465,18 @@ 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);
-    if ((n = parse_find_node("hideDisabled", node)))
-        config_theme_hidedisabled = parse_bool(doc, n);
     if ((n = parse_find_node("animateIconify", node)))
         config_animate_iconify = parse_bool(doc, n);
 
@@ -827,7 +831,6 @@ void config_startup(ObParseInst *i)
     config_animate_iconify = TRUE;
     config_title_layout = g_strdup("NLIMC");
     config_theme_keepborder = TRUE;
-    config_theme_hidedisabled = FALSE;
 
     config_font_activewindow = NULL;
     config_font_inactivewindow = NULL;