Merge lp:~ken-vandine/software-center/lp_982567 into lp:software-center

[Ken VanDine]

Check if the proxy is enabled, if the proxy host is set but not enabled we shouldn't attempt to use the proxy (LP: #982567)

[Michael Vogt (mvo)]

Hey Ken, thanks a lot for your branch!

It looks fine, except that I was told that the "enabled" key is actually deprecated, i.e. dconf-editor
shows me:
Summary: Unused; ignore
Description: This key is not used; HTTP proxying is enabled when the host key is non-empty and the port is non-0.

So I wonder what s-c should do, my assumption was to follow the suggestion in dconf-editor and ignore it, but
the bugreport indicates this leads to other problems. Now I'm not sure in what situations s-c should honor it and
in which it should not. Especially since it appears that the new gnome-control-center is not actually using it
anymore.

review: Needs Information

[Ken VanDine (ken-vandine)]

Oh, interesting. So gnome-control-center seems to be changing the value of org.gnome.system.proxy.mode to "none" if the proxy id disabled, I'll resubmit.

[Ken VanDine (ken-vandine)]

org.gnome.system.proxy.http.enabled is actually ignored, the proper key to check is actually org.gnome.system.proxy.mode (LP: #982567)

review: Needs Resubmitting

[lp:~ken-vandine/software-center/lp_982567]

3002. By Ken VanDine on 2012-05-10

org.gnome.system.proxy.http.enabled is actually ignored, the proper key to check is actually org.gnome.system.proxy.mode (LP: #982567)

[Michael Vogt (mvo)]

Thanks Ken for this update!

This looks good and works fine.

review: Approve

=== modified file 'softwarecenter/utils.py'
--- softwarecenter/utils.py	2012-04-25 08:19:42 +0000
+++ softwarecenter/utils.py	2012-05-10 19:44:19 +0000
@@ -241,10 +241,18 @@
     """
     # check if this is actually available and usable. if not
     # well ... it segfaults (thanks pygi)
-    key = "org.gnome.system.proxy.http"
-    if not key in Gio.Settings.list_schemas():
-        raise ValueError("no key '%s'" % key)
-    settings = Gio.Settings.new(key)
+    schemas = ["org.gnome.system.proxy", "org.gnome.system.proxy.http"]
+    for schema in schemas:
+        if not schema in Gio.Settings.list_schemas():
+            raise ValueError("no schema '%s'" % schema)
+
+    # Check to see if proxy mode is set to none before checking for host
+    psettings = Gio.Settings.new("org.gnome.system.proxy");
+    if "none" in psettings.get_string("mode"):
+        return None
+
+    # If proxy mode isn't "none" check to see if host and port is set
+    settings = Gio.Settings.new("org.gnome.system.proxy.http")
     if settings.get_string("host"):
         authentication = ""
         if settings.get_boolean("use-authentication"):