gnome-terminal r2753 - trunk/src

[chpe svn gnome org]

Author: chpe
Date: Thu May 29 19:51:02 2008
New Revision: 2753
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=2753&view=rev

Log:
Don't crash when we can't get the proxy pwd from gconf.


Modified:
   trunk/src/terminal-screen.c

Modified: trunk/src/terminal-screen.c
==============================================================================
--- trunk/src/terminal-screen.c	(original)
+++ trunk/src/terminal-screen.c	Thu May 29 19:51:02 2008
@@ -947,9 +947,6 @@
                                    TerminalScreen *screen)
 {
   TerminalScreenPrivate *priv = screen->priv;
-  TerminalProfile *profile;
-
-  profile = priv->profile;
 
   update_color_scheme (screen);
 
@@ -1179,7 +1176,7 @@
   retval[i] = g_strdup ("TERM=xterm"); /* FIXME configurable later? */
   ++i;
 
-  /* FIXMEchpe: moving the tab between windows will make this invalid... */
+  /* FIXMEchpe: moving the tab between windows, or the window between displays will make this invalid... */
   retval[i] = g_strdup_printf ("WINDOWID=%ld",
                                GDK_WINDOW_XWINDOW (term->window));
   ++i;
@@ -1216,8 +1213,13 @@
 					      "/authentication_password",
 					      NULL);
 
-	  if (user != '\0')
-	    auth = g_strdup_printf ("%s:%s", user, password);
+	  if (user && user != '\0')
+            {
+              if (password)
+                auth = g_strdup_printf ("%s:%s", user, password);
+              else
+                auth = g_strdup (user);
+            }
 
 	  g_free (user);
 	  g_free (password);