X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient.c;h=fe23f05df94f017af187122ac5a4da59b6f254f2;hb=9f2a844beb62287e12e75bf207e4c55bc14b6209;hp=83ced0103c01e7f6e8ba4fa2a2603ec8e5864766;hpb=7cbcc099efa9fd5f4334f564c38abfc734db6ffd;p=chaz%2Fopenbox diff --git a/openbox/client.c b/openbox/client.c index 83ced010..fe23f05d 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -1308,10 +1308,11 @@ void client_update_title(ObClient *self) GList *it; guint32 nums; guint i; - char *data = NULL; + gchar *data = NULL; gboolean read_title; + gchar *old_title; - g_free(self->title); + old_title = self->title; /* try netwm */ if (!PROP_GETS(self->window, net_wm_name, utf8, &data)) @@ -1319,6 +1320,10 @@ void client_update_title(ObClient *self) if (!PROP_GETS(self->window, wm_name, locale, &data)) data = g_strdup("Unnamed Window"); + /* 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 = it->next) @@ -1339,7 +1344,7 @@ void client_update_title(ObClient *self) char *ndata; ndata = g_strdup_printf("%s - [%u]", data, self->title_count); g_free(data); - data = vdata; + data = ndata; } PROP_SETS(self->window, net_wm_visible_name, data); @@ -1349,6 +1354,8 @@ void client_update_title(ObClient *self) if (self->frame) frame_adjust_title(self->frame); + g_free(old_title); + /* update the icon title */ data = NULL; g_free(self->icon_title);