diff options
| author | Mikael Magnusson <mikachu@comhem.se> | 2006-08-16 18:11:47 +0000 |
|---|---|---|
| committer | Mikael Magnusson <mikachu@comhem.se> | 2006-08-16 18:11:47 +0000 |
| commit | 8eea64ca0847a36c3f0e9673b8b3c4bd11bc27ca (patch) | |
| tree | e09132640e5e088192c21de0187cfa2df9f589ec | |
| parent | 1ffd89672fa62cdf2c9e707fdf53e6d8a0080b6f (diff) | |
adjust logic to be... logical
| -rw-r--r-- | openbox/client.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/openbox/client.c b/openbox/client.c index 2cf014f6..05a7b891 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -1535,8 +1535,8 @@ void client_update_title(ObClient *self) /* try netwm */ if (!PROP_GETS(self->window, net_wm_name, utf8, &data)) { /* try old x stuff */ - if (!PROP_GETS(self->window, wm_name, locale, &data) - && !PROP_GETS(self->window, wm_name, utf8, &data)) { + if (!(PROP_GETS(self->window, wm_name, locale, &data) + || PROP_GETS(self->window, wm_name, utf8, &data))) { // http://developer.gnome.org/projects/gup/hig/draft_hig_new/windows-alert.html if (self->transient) { data = g_strdup(""); @@ -1573,8 +1573,8 @@ void client_update_title(ObClient *self) data = ndata; } - PROP_SETS(self->window, net_wm_visible_name, data); no_number: + PROP_SETS(self->window, net_wm_visible_name, data); self->title = data; if (self->frame) @@ -1590,7 +1590,8 @@ no_number: /* try netwm */ if (!PROP_GETS(self->window, net_wm_icon_name, utf8, &data)) /* try old x stuff */ - if (!PROP_GETS(self->window, wm_icon_name, locale, &data)) { + if (!(PROP_GETS(self->window, wm_icon_name, locale, &data) + || PROP_GETS(self->window, wm_icon_name, utf8, &data))) { data = g_strdup(self->title); read_title = FALSE; } |