Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-session/gnome-session/ChangeLog,v
retrieving revision 1.525
diff -u -p -r1.525 ChangeLog
--- ChangeLog   15 Nov 2006 23:59:07 -0000      1.525
+++ ChangeLog   27 Nov 2006 04:02:20 -0000
@@ -1,3 +1,11 @@
+2006-11-26  Ray Strode  <rstrode@redhat.com>
+
+       Set http_proxy environment variable _correctly_
+       for legacy apps (bug 84315 again).
+
+       * gsm-proxy.[ch] (gsm_set_up_legacy_proxy_environment):
+       swap the @ and : in the environment variable
+
 2006-11-16  Vincent Untz  <vuntz@gnome.org>
 
        * gnome-wm: improved a bit to do less stuff if  is set
Index: gsm-proxy.c
===================================================================
RCS file: /cvs/gnome/gnome-session/gnome-session/gsm-proxy.c,v
retrieving revision 1.1
diff -u -p -r1.1 gsm-proxy.c
--- gsm-proxy.c 27 Oct 2006 01:19:45 -0000      1.1
+++ gsm-proxy.c 27 Nov 2006 04:02:21 -0000
@@ -93,16 +93,16 @@ gsm_set_up_legacy_proxy_environment (voi
   if (port <= 0)
     http_proxy = g_strdup_printf ("http://%s%s%s%s%s",
                                   user_name != NULL? user_name : "",
-                                  user_name != NULL && password != NULL? "@" : "",
+                                  user_name != NULL && password != NULL? ":" : "",
                                   user_name != NULL && password != NULL? password : "",
-                                  user_name != NULL? ":" : "",
+                                  user_name != NULL? "@" : "",
                                   host); 
   else
     http_proxy = g_strdup_printf ("http://%s%s%s%s%s:%d",
                                   user_name != NULL? user_name : "",
-                                  user_name != NULL && password != NULL? "@" : "",
+                                  user_name != NULL && password != NULL? ":" : "",
                                   user_name != NULL && password != NULL? password : "",
-                                  user_name != NULL? ":" : "",
+                                  user_name != NULL? "@" : "",
                                   host, port); 
   g_setenv ("http_proxy", http_proxy, TRUE);
