Merge lp:~ted/ubuntu-geoip/gnome-features into lp:ubuntu-geoip

[Ted Gould]

Add the gnome feature for proxy configuration support.

Add the gnome feature for proxy configuration support.

[lp:~ted/ubuntu-geoip/gnome-features]

35. By Ted Gould on 2013-03-13

Adding the gnome headers as a build dep

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:35
http://jenkins.qa.ubuntu.com/job/ubuntu-geoip-ci/4/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-geoip-ci/./build=pbuilder,distribution=quantal,flavor=amd64/4/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-geoip-ci/./build=pbuilder,distribution=quantal,flavor=i386/4/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-geoip-ci/./build=pbuilder,distribution=raring,flavor=amd64/4/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-geoip-ci/./build=pbuilder,distribution=raring,flavor=i386/4/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/ubuntu-geoip-ci/4//rebuild/?

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

Good fix.

It would be better to have test coverage for this, but am not going to block the review on it, the one new call is on a shipping lib...

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2012-10-15 15:21:30 +0000
+++ configure.ac	2013-03-13 01:14:21 +0000
@@ -37,6 +37,7 @@
 PKG_CHECK_MODULES(PROVIDER, glib-2.0 >= $GLIB_REQUIRED_VERSION
                             geoclue >= GEOCLUE_REQUIRED_VERSION
                             libsoup-2.4 >= SOUP_REQUIRED_VERSION
+                            libsoup-gnome-2.4 >= SOUP_REQUIRED_VERSION
                             libnm-glib >= NM_REQUIRED_VERSION)
 
 AC_SUBST(PROVIDER_CFLAGS)
 
=== modified file 'debian/control'
--- debian/control	2012-11-27 20:06:12 +0000
+++ debian/control	2013-03-13 01:14:21 +0000
@@ -9,6 +9,7 @@
                pkg-config,
                libglib2.0-dev,
                libsoup2.4-dev,
+               libsoup-gnome2.4-dev,
                libgeoclue-dev,
                libnm-glib-dev (>= 0.8.998),
                libdbustest1-dev,
 
=== modified file 'src/ubuntu-geoip-provider.c'
--- src/ubuntu-geoip-provider.c	2013-03-13 01:14:21 +0000
+++ src/ubuntu-geoip-provider.c	2013-03-13 01:14:21 +0000
@@ -34,7 +34,7 @@
 #include <geoclue/gc-iface-address.h>
 
 /* Soup */
-#include <libsoup/soup.h>
+#include <libsoup/soup-gnome.h>
 
 /* Network Manager */
 #include <nm-client.h>
@@ -252,6 +252,7 @@
 	/* Allocate */
 	if (test_data == NULL) {
 		self->priv->soup = soup_session_async_new();
+		soup_session_add_feature_by_type(self->priv->soup, soup_proxy_resolver_gnome_get_type());
 		self->priv->client = nm_client_new();
 		g_signal_connect(G_OBJECT(self->priv->client), "notify::" NM_CLIENT_STATE, G_CALLBACK(nm_state_change), self);