these two changes make the text a lot more readable

[chaz/openbox] / openbox / client.c

diff --git a/openbox/client.c b/openbox/client.c
index a465f566326d58d29256d1addaef02eee7eef64b..a9a99ceef0caaeda7fa4418c83c591dc4bc4ee9a 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -1257,8 +1257,12 @@ void client_setup_decor_and_functions(ObClient *self)
 
     /* finally, the user can have requested no decorations, which overrides
        everything (but doesnt give it a border if it doesnt have one) */
-    if (self->undecorated)
-        self->decorations = 0; //&= OB_FRAME_DECOR_BORDER;
+    if (self->undecorated) {
+        if (config_theme_keepborder)
+            self->decorations &= OB_FRAME_DECOR_BORDER;
+        else
+            self->decorations = 0;
+    }
 
     /* if we don't have a titlebar, then we cannot shade! */
     if (!(self->decorations & OB_FRAME_DECOR_TITLEBAR))
@@ -1446,9 +1450,10 @@ void client_update_title(ObClient *self)
         /* try old x stuff */
         if (!PROP_GETS(self->window, wm_name, locale, &data))
             // http://developer.gnome.org/projects/gup/hig/draft_hig_new/windows-alert.html
-            if (self->transient)
-                data = '\0';
-            else
+            if (self->transient) {
+                data = g_strdup("");
+                goto no_number;
+            } else
                 data = g_strdup("Unnamed Window");
 
     /* did the title change? then reset the title_count */
@@ -1479,7 +1484,7 @@ void client_update_title(ObClient *self)
     }
 
     PROP_SETS(self->window, net_wm_visible_name, data);
-
+no_number:
     self->title = data;
 
     if (self->frame)