r18219 - in /packages/experimental/epiphany-extensions-more: debian/README.Debian misc/video-downloader.py

[joss at users.alioth.debian.org]

Author: joss
Date: Fri Jan  9 13:06:46 2009
New Revision: 18219

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=18219
Log:
Proxy fixes for the video downloader

Modified:
    packages/experimental/epiphany-extensions-more/debian/README.Debian
    packages/experimental/epiphany-extensions-more/misc/video-downloader.py

Modified: packages/experimental/epiphany-extensions-more/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/epiphany-extensions-more/debian/README.Debian?rev=18219&op=diff
==============================================================================
--- packages/experimental/epiphany-extensions-more/debian/README.Debian (original)
+++ packages/experimental/epiphany-extensions-more/debian/README.Debian Fri Jan  9 13:06:46 2009
@@ -38,6 +38,7 @@
  ----------------
 Middle-click on the icon is now supported, it opens the video inline in
 a new tab.
+Proxy fixes.
 
  view-source
  -----------

Modified: packages/experimental/epiphany-extensions-more/misc/video-downloader.py
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/epiphany-extensions-more/misc/video-downloader.py?rev=18219&op=diff
==============================================================================
--- packages/experimental/epiphany-extensions-more/misc/video-downloader.py (original)
+++ packages/experimental/epiphany-extensions-more/misc/video-downloader.py Fri Jan  9 13:06:46 2009
@@ -168,8 +168,12 @@
         proxy = '%s:%s' % (g.get_string(GCONF_KEY_PROXY_HOST), \
                 g.get_int(GCONF_KEY_PROXY_PORT))
         if g.get_bool(GCONF_KEY_USE_PROXY_AUTH):
-            proxy = 'http://%s:%s@%s' % (g.get_string(GCONF_KEY_PROXY_USER), \
-                    g.get_string(GCONF_KEY_PROXY_PASSWORD), proxy)
+            auth = '%s:%s@'%(g.get_string(GCONF_KEY_PROXY_USER), \
+                             g.get_string(GCONF_KEY_PROXY_PASSWORD))
+        else:
+            auth = ''
+        proxy = 'http://%s%s:%i'%(auth, g.get_string(GCONF_KEY_PROXY_HOST), \
+                                  g.get_int(GCONF_KEY_PROXY_PORT))
     else:
         proxy = None