Ubuntu GeoIP

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

  1. gnome-features
  2. Merge into trunk
Proposed by Ted Gould
Status: Merged
Approved by: Ted Gould
Approved revision: 35
Merged at revision: 34
Proposed branch: lp:~ted/ubuntu-geoip/gnome-features
Merge into: lp:ubuntu-geoip
Prerequisite: lp:~ted/ubuntu-geoip/gtype-deprecation
Diff against target: 43 lines (+4/-1)
3 files modified
configure.ac (+1/-0)
debian/control (+1/-0)
src/ubuntu-geoip-provider.c (+2/-1)
To merge this branch: bzr merge lp:~ted/ubuntu-geoip/gnome-features
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+153035@code.launchpad.net

Commit message

Add the gnome feature for proxy configuration support.

Description of the change

Add the gnome feature for proxy configuration support.

To post a comment you must log in.
lp:~ted/ubuntu-geoip/gnome-features updated
35. By Ted Gould

Adding the gnome headers as a build dep

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
Charles Kerr (charlesk) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2012-10-15 15:21:30 +0000
3+++ configure.ac 2013-03-13 01:14:21 +0000
4@@ -37,6 +37,7 @@
5 PKG_CHECK_MODULES(PROVIDER, glib-2.0 >= $GLIB_REQUIRED_VERSION
6 geoclue >= GEOCLUE_REQUIRED_VERSION
7 libsoup-2.4 >= SOUP_REQUIRED_VERSION
8+ libsoup-gnome-2.4 >= SOUP_REQUIRED_VERSION
9 libnm-glib >= NM_REQUIRED_VERSION)
10
11 AC_SUBST(PROVIDER_CFLAGS)
12
13=== modified file 'debian/control'
14--- debian/control 2012-11-27 20:06:12 +0000
15+++ debian/control 2013-03-13 01:14:21 +0000
16@@ -9,6 +9,7 @@
17 pkg-config,
18 libglib2.0-dev,
19 libsoup2.4-dev,
20+ libsoup-gnome2.4-dev,
21 libgeoclue-dev,
22 libnm-glib-dev (>= 0.8.998),
23 libdbustest1-dev,
24
25=== modified file 'src/ubuntu-geoip-provider.c'
26--- src/ubuntu-geoip-provider.c 2013-03-13 01:14:21 +0000
27+++ src/ubuntu-geoip-provider.c 2013-03-13 01:14:21 +0000
28@@ -34,7 +34,7 @@
29 #include <geoclue/gc-iface-address.h>
30
31 /* Soup */
32-#include <libsoup/soup.h>
33+#include <libsoup/soup-gnome.h>
34
35 /* Network Manager */
36 #include <nm-client.h>
37@@ -252,6 +252,7 @@
38 /* Allocate */
39 if (test_data == NULL) {
40 self->priv->soup = soup_session_async_new();
41+ soup_session_add_feature_by_type(self->priv->soup, soup_proxy_resolver_gnome_get_type());
42 self->priv->client = nm_client_new();
43 g_signal_connect(G_OBJECT(self->priv->client), "notify::" NM_CLIENT_STATE, G_CALLBACK(nm_state_change), self);
44

Subscribers

People subscribed via source and target branches

to all changes: