From: Mikael Magnusson <mikachu@comhem.se>
Date: Fri, 18 Aug 2006 21:23:02 +0000 (+0000)
Subject: fix a silly copy paste bug, titlenumber should now be disableable
X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;h=1de9c1901cf7e95ace3f934f97ceff7cf77801a9;p=chaz%2Fopenbox

fix a silly copy paste bug, titlenumber should now be disableable
---

diff --git a/openbox/client.c b/openbox/client.c
index d107c470..21673535 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -1546,11 +1546,12 @@ void client_update_title(ObClient *self)
         }
     }
 
-    /* did the title change? then reset the title_count */
-    if (old_title && 0 != strncmp(old_title, data, strlen(data)))
-        self->title_count = 1;
-
     if (config_title_number) {
+
+        /* did the title change? then reset the title_count */
+        if (old_title && 0 != strncmp(old_title, data, strlen(data)))
+            self->title_count = 1;
+
         /* look for duplicates and append a number */
         nums = 0;
         for (it = client_list; it; it = g_list_next(it))
@@ -1573,7 +1574,8 @@ void client_update_title(ObClient *self)
             g_free(data);
             data = ndata;
         }
-    }
+    } else
+        self->title_count = 1;
 
 no_number:
     PROP_SETS(self->window, net_wm_visible_name, data);
diff --git a/openbox/config.c b/openbox/config.c
index 0eb60221..c8ffe0c6 100644
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -432,7 +432,7 @@ static void parse_theme(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
         config_title_layout = parse_string(doc, n);
     }
     if ((n = parse_find_node("titleNumber", node)))
-        config_theme_hidedisabled = parse_bool(doc, n);
+        config_theme_titlenumber = parse_bool(doc, n);
     if ((n = parse_find_node("keepBorder", node)))
         config_theme_keepborder = parse_bool(doc, n);
     if ((n = parse_find_node("hideDisabled", node)))