Merge lp:~wmills/ubuntu/lucid/gnome-terminal/proxy-wget-fix into lp:ubuntu/lucid/gnome-terminal

[Bill Mills]

Fix to not add a trailing comma on no_proxy env var
This fixes one of the lucid specific issues for LP #232469

[Pardon me if this is jumping the gun. I don't know the process but I figure if this is too early you will let me know.]

[Daniel Holbach (dholbach)]

It looks like the this was fixed as part of bug 534225.

=== modified file 'debian/changelog'
--- debian/changelog	2010-03-23 21:41:22 +0000
+++ debian/changelog	2010-06-19 23:22:24 +0000
@@ -1,3 +1,11 @@
+gnome-terminal (2.29.6-0ubuntu6) lucid; urgency=low
+
+  * Don't add a trailing comma to the no_proxy env variable
+    It messes up wget (and everything that uses it like apt, etc)
+    This fixes one of the lucid specific issues discussed in LP #232469
+
+ -- Bill Mills <[e-mail]> Sat, 19 Jun 2010 18:33:04 -0400
+
 gnome-terminal (2.29.6-0ubuntu5) lucid; urgency=low
 
   * Revert the previous changes to add a new profile, as changing

=== modified file 'src/terminal-screen.c'
--- src/terminal-screen.c	2010-02-03 21:03:37 +0000
+++ src/terminal-screen.c	2010-06-19 23:22:24 +0000
@@ -1431,12 +1431,13 @@
 	  GSList *old;
 
 	  g_string_append (buf, ignore->data);
-	  g_string_append_c (buf, ',');
 
 	  old = ignore;
 	  ignore = g_slist_next (ignore);
 	  g_free (old->data);
 	  g_slist_free_1 (old);
+	  if (ignore != NULL)
+	    g_string_append_c (buf, ',');
 	}
       set_proxy_env (env_table, "no_proxy", g_string_free (buf, FALSE));
     }