gnome-terminal r3222 - trunk/src

[chpe svn gnome org]

Author: chpe
Date: Sat Nov 29 19:49:25 2008
New Revision: 3222
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=3222&view=rev

Log:
Persist the override title, not the raw title.

Modified:
   trunk/src/terminal-screen.c

Modified: trunk/src/terminal-screen.c
==============================================================================
--- trunk/src/terminal-screen.c	(original)
+++ trunk/src/terminal-screen.c	Sat Nov 29 19:49:25 2008
@@ -1687,9 +1687,11 @@
                                     const char     *title)
 {
   TerminalScreenPrivate *priv = screen->priv;
-  
-  g_assert (priv->override_title == NULL);
+  const char *old_title;
+
+  old_title = priv->override_title;
   priv->override_title = g_strdup (title);
+  g_free (old_title);
 
   terminal_screen_set_dynamic_title (screen, title, FALSE);
   terminal_screen_set_dynamic_icon_title (screen, title, FALSE);
@@ -2260,9 +2262,8 @@
     terminal_util_key_file_set_argv (key_file, group, TERMINAL_CONFIG_TERMINAL_PROP_COMMAND,
                                      -1, priv->override_command);
 
-  /* FIXMEchpe: only persist user-set titles here */
-  if (priv->raw_title)
-    g_key_file_set_string (key_file, group, TERMINAL_CONFIG_TERMINAL_PROP_TITLE, priv->raw_title);
+  if (priv->override_title)
+    g_key_file_set_string (key_file, group, TERMINAL_CONFIG_TERMINAL_PROP_TITLE, priv->override_title);
 
   dir = terminal_screen_get_working_dir (screen);
   if (dir != NULL && *dir != '\0') /* should always be TRUE anyhow */