Ticket #3262: dex-session.diff

sugar-session

@@ -2 +2 @@
 # Copyright (C) 2006, Red Hat, Inc.
 # Copyright (C) 2009, One Laptop Per Child Association Inc
 # Copyright (C) 2010, Plan Ceibal <comunidad@plan.ceibal.edu.uy>
+# Copyright (C) 2011, OLPC-AU.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -253 +254 @@
     if timezone is not None and timezone:
         os.environ['TZ'] = timezone
 
+    ## JV export http_proxy from .gconf  
+    sys_dir = '/system/http_proxy'
+    client = gconf.client_get_default()
+    use_proxy = client.get_string('/system/proxy/mode')
+    if use_proxy != 'none':
+        http_host = client.get_string('%s/host' % sys_dir)
+        http_port = client.get_int('%s/port' % sys_dir)
+        use_auth = client.get_bool('%s/use_authentication' % sys_dir)
+        proxy_string = '%s:%d' % (http_host, http_port)
+        if use_auth is True:
+            auth_user = client.get_string('%s/authentication_user' % sys_dir)
+            auth_pass = client.get_string('%s/authentication_password' % sys_dir)
+            proxy_info = '%s:%s@%s' % (auth_user, auth_pass, proxy_string)
+        else:
+            proxy_info = proxy_string
+        os.environ['http_proxy'] = 'http://%s' % proxy_info
+    else:
+        pass
+ 
     set_fonts()
 
     # this must be added early, so that it executes and unfreezes the screen