Merge lp:~jibel/synaptic/bug.130289 into lp:synaptic

[Jean-Baptiste Lallement]

Resubmitting since I inadvertently removed the wrong branch.

=== modified file 'gtk/rgpreferenceswindow.cc'
--- gtk/rgpreferenceswindow.cc	2009-01-07 09:51:51 +0000
+++ gtk/rgpreferenceswindow.cc	2010-03-31 16:14:25 +0000
@@ -26,6 +26,7 @@
 
 #include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>
+#include <apt-pkg/strutl.h>
 #include <gtk/gtk.h>
 #include <cassert>
 #include <cstring>
@@ -160,10 +161,11 @@
 	 g_free(s);
       }
       // setup the proxy 
-      if(!httpUser.empty() && !httpPass.empty()) {
-	 s = g_strdup_printf("http://%s:%s@%s:%i/", 
-			     httpUser.c_str(), httpPass.c_str(),
-			     http.c_str(), httpPort);
+      if(!httpUser.empty() && !httpPass.empty()) { 
+          s = g_strdup_printf("http://%s:%s@%s:%i/",
+                  QuoteString(httpUser, "@%:/").c_str(),
+                  QuoteString(httpPass, "@%:/").c_str(),
+                  http.c_str(), httpPort);
 	 _config->Set("Acquire::http::Proxy", s);
 	 g_free(s);
       }