[Xfce4-commits] r30295 - terminal/trunk/terminal

[Nick Schermer]

Author: nick
Date: 2009-07-12 14:04:55 +0000 (Sun, 12 Jul 2009)
New Revision: 30295

Modified:
   terminal/trunk/terminal/terminal-preferences.c
   terminal/trunk/terminal/terminal-screen.c
Log:
Fix some issues in the tab title.

Window title was showed in the tab too, also
disable the VTE title bug by default.


Modified: terminal/trunk/terminal/terminal-preferences.c
===================================================================
--- terminal/trunk/terminal/terminal-preferences.c	2009-07-12 13:48:39 UTC (rev 30294)
+++ terminal/trunk/terminal/terminal-preferences.c	2009-07-12 14:04:55 UTC (rev 30295)
@@ -1295,7 +1295,7 @@
                                    g_param_spec_boolean ("vte-workaround-title-bug",
                                                          "vte-workaround-title-bug",
                                                          "VteWorkaroundTitleBug",
-                                                         TRUE,
+                                                         FALSE,
                                                          EXO_PARAM_READWRITE));
 
   /**

Modified: terminal/trunk/terminal/terminal-screen.c
===================================================================
--- terminal/trunk/terminal/terminal-screen.c	2009-07-12 13:48:39 UTC (rev 30294)
+++ terminal/trunk/terminal/terminal-screen.c	2009-07-12 14:04:55 UTC (rev 30295)
@@ -815,17 +815,24 @@
 static void
 terminal_screen_update_title (TerminalScreen *screen)
 {
-  gchar *title;
+  const gchar *title;
 
   g_object_notify (G_OBJECT (screen), "title");
 
   if (G_LIKELY (screen->tab_label != NULL))
     {
       /* update tab label */
-      title = terminal_screen_get_title (screen);
+      if (IS_STRING (screen->custom_title))
+        title = screen->custom_title;
+      else
+        {
+          title = vte_terminal_get_window_title (VTE_TERMINAL (screen->terminal));
+          if (G_UNLIKELY (title == NULL))
+            title = _("Untitled");
+        }
+
       gtk_label_set_text (GTK_LABEL (screen->tab_label), title);
       gtk_widget_set_tooltip_text (GTK_WIDGET (screen->tab_label), title);
-      g_free (title);
     }
 }
 
@@ -1355,7 +1362,7 @@
 
   terminal_return_val_if_fail (TERMINAL_IS_SCREEN (screen), NULL);
 
-  if (G_UNLIKELY (screen->custom_title != NULL))
+  if (IS_STRING (screen->custom_title))
     return g_strdup (screen->custom_title);
 
   g_object_get (G_OBJECT (screen->preferences),