oops! wrong thread!
On Thu, Jan 26, 2012 at 09:26, Anish Mangal <[email protected]> wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > Hi, > > I can't recall where, but a concern was raised about the original > source of the svg image in the patch. > > I used the svg image present here: > https://commons.wikimedia.org/wiki/File:Simple_Globe.svg > > and modified it to add the rectangle which is present in the center. > So the patch (or svg code in image) should also attribute the original > author of the globe-svg. > > On 01/24/2012 07:31 PM, Sascha Silbe wrote: >> From: Jerry Vonau <[email protected]> >> >> Some applications and tools and even some parts of Sugar will use >> the http_proxy environment variable if set, but don't use the Gnome >> (GConf) proxy settings. >> >> After changing the GConf proxy settings, Sugar needs to be >> restarted for the http_proxy environment variable to be updated. >> >> [factored out into separate function; some clean-ups; added >> description] Signed-off-by: Sascha Silbe >> <[email protected]> --- bin/sugar-session | 26 >> ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 >> deletions(-) >> >> diff --git a/bin/sugar-session b/bin/sugar-session index >> ee0048d..7eaa8f1 100755 --- a/bin/sugar-session +++ >> b/bin/sugar-session @@ -2,6 +2,7 @@ # Copyright (C) 2006, Red Hat, >> Inc. # Copyright (C) 2009, One Laptop Per Child Association Inc # >> Copyright (C) 2010, Plan Ceibal <[email protected]> +# >> 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 @@ -211,6 +212,30 @@ def >> setup_accessibility_cb(): accessibility_manager = >> accessibility.AccessibilityManager() >> accessibility_manager.setup_accessibility() >> >> + +def export_proxy_settings(): + """Export manual proxy >> settings from GConf as environment variables + + Some >> applications and tools and even some parts of Sugar will use + >> the http_proxy environment variable if set, but don't use the >> Gnome + (GConf) proxy settings. + """ + client = >> gconf.client_get_default() + if >> client.get_string('/system/proxy/mode') != 'manual': + >> return + + http_host = >> client.get_string('/system/http_proxy/host') + http_port = >> client.get_int('/system/http_proxy/port') + use_auth = >> client.get_bool('/system/http_proxy/use_authentication') + >> proxy_info = '%s:%d' % (http_host, http_port) + if use_auth: + >> user = client.get_string('/system/http_proxy/authentication_user') >> + pword = >> client.get_string('/system/http_proxy/authentication_password') + >> proxy_info = '%s:%s@%s' % (user, pword, proxy_info) + + >> os.environ['http_proxy'] = 'http://%s/' % proxy_info + + def >> main(): try: from sugar import env @@ -253,6 +278,7 @@ def main(): >> if timezone is not None and timezone: os.environ['TZ'] = timezone >> >> + export_proxy_settings() set_fonts() >> >> # this must be added early, so that it executes and unfreezes the >> screen -- 1.7.6 >> > > - -- > Anish > > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v1.4.11 (GNU/Linux) > Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ > > iQEcBAEBAgAGBQJPIThIAAoJEBoxUdDHDZVpkQoH/37K+kRYPmYDeVtGhraKefi2 > XVA2ODTN3cjUYlAY/xTvVw6RhBNfTpgsLQBE5VE11f9hAVpnPPmOS+epPmedD10r > 7eKLsa1w0A/MhkwYiptjKqzhpIj5xEwOI0MtmT5jlF4qLcfs2BUwqqwwyhj8NY4i > zrgFvHF/NI8Qa7/L9wfWjx6Cusay9SpK6PrYT6yvKS/e44ExKWXK5QESa3mms/Zh > Tmsjl5rggxpsGO2SsoqFUAEDGJHNpJmkCmPDnm51NbYQytqxbmQ3jQJpQO4a9V5I > sRJuP8qwJvcfMAymaziQauBZjuPuIKRmrPlTbTlol1otG/jRLbtehTu5si4zevo= > =IQS7 > -----END PGP SIGNATURE----- _______________________________________________ Sugar-devel mailing list [email protected] http://lists.sugarlabs.org/listinfo/sugar-devel
