all repos — openbox @ 8eea64ca0847a36c3f0e9673b8b3c4bd11bc27ca

openbox fork - make it a bit more like ryudo 

adjust logic to be... logical
Mikael Magnusson mikachu@comhem.se
commit

8eea64ca0847a36c3f0e9673b8b3c4bd11bc27ca

parent

1ffd89672fa62cdf2c9e707fdf53e6d8a0080b6f

1 files changed, 5 insertions(+), 4 deletions(-)

jump to
M openbox/client.c → openbox/client.c 
@@ -1535,8 +1535,8 @@ 
     /* 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 @@ g_free(data);
         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 @@ read_title = TRUE;
     /* 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;
         }