proxy/gnome: Use this in an Ubuntu (Unity) session too.
authorIain Lane <iain.lane@canonical.com>
Mon, 29 Apr 2013 17:42:53 +0000 (17:42 +0000)
committerDan Winship <danw@gnome.org>
Mon, 13 May 2013 20:41:44 +0000 (16:41 -0400)
This avoids falling back to libproxy unnecessarily.

https://bugs.launchpad.net/ubuntu/+source/glib-networking/+bug/1172792

https://bugzilla.gnome.org/show_bug.cgi?id=698936

proxy/gnome/gproxyresolvergnome.c

index 4cdba0a..724455f 100644 (file)
@@ -313,7 +313,8 @@ update_settings (GProxyResolverGnome *resolver)
 static gboolean
 g_proxy_resolver_gnome_is_supported (GProxyResolver *object)
 {
-  return !g_strcmp0 (g_getenv ("DESKTOP_SESSION"), "gnome");
+  return !g_strcmp0 (g_getenv ("DESKTOP_SESSION"), "gnome") ||
+         !g_strcmp0 (g_getenv ("DESKTOP_SESSION"), "ubuntu");
 }
 
 static inline gchar **