nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

adjust logic to be... logical

Browse source
This commit is contained in:
Mikael Magnusson 2006-08-16 18:11:47 +00:00
parent 1ffd89672f
commit 8eea64ca08
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
openbox/client.c
View file

@ -1535,8 +1535,8 @@ void client_update_title(ObClient *self)
/* try netwm */ /* try netwm */
if (!PROP_GETS(self->window, net_wm_name, utf8, &data)) { if (!PROP_GETS(self->window, net_wm_name, utf8, &data)) {
/* try old x stuff */ /* try old x stuff */
if (!PROP_GETS(self->window, wm_name, locale, &data) if (!(PROP_GETS(self->window, wm_name, locale, &data)
&& !PROP_GETS(self->window, wm_name, utf8, &data)) { || PROP_GETS(self->window, wm_name, utf8, &data))) {
// http://developer.gnome.org/projects/gup/hig/draft_hig_new/windows-alert.html // http://developer.gnome.org/projects/gup/hig/draft_hig_new/windows-alert.html
if (self->transient) { if (self->transient) {
data = g_strdup(""); data = g_strdup("");
@ -1573,8 +1573,8 @@ void client_update_title(ObClient *self)
data = ndata; data = ndata;
} }
PROP_SETS(self->window, net_wm_visible_name, data);
no_number: no_number:
PROP_SETS(self->window, net_wm_visible_name, data);
self->title = data; self->title = data;
if (self->frame) if (self->frame)
@ -1590,7 +1590,8 @@ no_number:
/* try netwm */ /* try netwm */
if (!PROP_GETS(self->window, net_wm_icon_name, utf8, &data)) if (!PROP_GETS(self->window, net_wm_icon_name, utf8, &data))
/* try old x stuff */ /* 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); data = g_strdup(self->title);
read_title = FALSE; read_title = FALSE;
} }