[sound-juicer] fixup! libjuicer: Add support for the "none" proxy mode

[Phillip Wood <pwood src gnome org>]

commit 0bbffac30354b8085a54637a51da7197bc957a67
Author: Phillip Wood <phillip wood dunelm org uk>
Date:   Thu May 8 11:20:13 2014 +0100

    fixup! libjuicer: Add support for the "none" proxy mode

 libjuicer/sj-metadata-gvfs.c         |    2 ++
 libjuicer/sj-metadata-musicbrainz5.c |    4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/libjuicer/sj-metadata-gvfs.c b/libjuicer/sj-metadata-gvfs.c
index 87a0669..7f825c5 100644
--- a/libjuicer/sj-metadata-gvfs.c
+++ b/libjuicer/sj-metadata-gvfs.c
@@ -276,6 +276,8 @@ sj_metadata_gvfs_class_init (SjMetadataGvfsClass *class)
                                     PROP_PROXY_USERNAME, "proxy-username");
   g_object_class_override_property (object_class,
                                     PROP_PROXY_PASSWORD, "proxy-password");
+  g_object_class_override_property (object_class,
+                                    PROP_PROXY_MODE, "proxy-mode");
 }
 
 
diff --git a/libjuicer/sj-metadata-musicbrainz5.c b/libjuicer/sj-metadata-musicbrainz5.c
index 3991daf..7d490e2 100644
--- a/libjuicer/sj-metadata-musicbrainz5.c
+++ b/libjuicer/sj-metadata-musicbrainz5.c
@@ -805,13 +805,13 @@ static void
 setup_http_proxy (SjMetadataMusicbrainz5Private *priv)
 {
   if (priv->proxy_mode == G_DESKTOP_PROXY_MODE_NONE ||
-      priv->proxy_mode == G_DESKTOP_PROXY_MODE_AUTOMATIC ||
+      priv->proxy_mode == G_DESKTOP_PROXY_MODE_AUTO ||
       priv->proxy_host == NULL || priv->proxy_port == 0) {
     mb5_query_set_proxyhost (priv->mb, NULL);
     mb5_query_set_proxyport (priv->mb, 0);
     mb5_query_set_proxyusername (priv->mb, NULL);
     mb5_query_set_proxypassword (priv->mb, NULL);
-    if (priv->proxy_mode == G_DESKTOP_PROXY_MODE_AUTOMATIC)
+    if (priv->proxy_mode == G_DESKTOP_PROXY_MODE_AUTO)
       g_warning ("Automatic proxy mode not supported yet, disabling proxy usage");
   } else if (priv->proxy_mode == G_DESKTOP_PROXY_MODE_MANUAL) {
     mb5_query_set_proxyhost (priv->mb, priv->proxy_host);