Ubuntu GeoIP

Merge lp:~cyphermox/ubuntu-geoip/nm0.9 into lp:ubuntu-geoip

  1. nm0.9
  2. Merge into trunk
Proposed by Mathieu Trudel-Lapierre
Status: Merged
Approved by: Ted Gould
Approved revision: 15
Merged at revision: 14
Proposed branch: lp:~cyphermox/ubuntu-geoip/nm0.9
Merge into: lp:ubuntu-geoip
Diff against target: 28 lines (+5/-2)
2 files modified
configure.ac (+1/-1)
src/ubuntu-geoip-provider.c (+4/-1)
To merge this branch: bzr merge lp:~cyphermox/ubuntu-geoip/nm0.9
Reviewer Review Type Date Requested Status
Ubuntu GeoIP Team Pending
Review via email: mp+63580@code.launchpad.net
To post a comment you must log in.

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 2010-10-21 21:18:53 +0000
3+++ configure.ac 2011-06-06 16:54:00 +0000
4@@ -27,7 +27,7 @@
5 GEOCLUE_REQUIRED_VERSION=0.12.0
6 GLIB_REQUIRED_VERSION=2.26.0
7 SOUP_REQUIRED_VERSION=2.31.0
8-NM_REQUIRED_VERSION=0.8.0
9+NM_REQUIRED_VERSION=0.8.998
10
11 PKG_CHECK_MODULES(PROVIDER, glib-2.0 >= $GLIB_REQUIRED_VERSION
12 geoclue >= GEOCLUE_REQUIRED_VERSION
13
14=== modified file 'src/ubuntu-geoip-provider.c'
15--- src/ubuntu-geoip-provider.c 2010-10-21 20:37:40 +0000
16+++ src/ubuntu-geoip-provider.c 2011-06-06 16:54:00 +0000
17@@ -565,7 +565,10 @@
18 g_return_if_fail(provider != NULL);
19
20 NMState state = nm_client_get_state (provider->priv->client);
21- gboolean connected = !(state == NM_STATE_CONNECTING || state == NM_STATE_DISCONNECTED);
22+ gboolean connected = !(state == NM_STATE_CONNECTING ||
23+ state == NM_STATE_DISCONNECTING ||
24+ state == NM_STATE_DISCONNECTED ||
25+ state == NM_STATE_ASLEEP);
26
27 if (provider->priv->connected != connected) {
28 /* Either way we want to refresh */

Subscribers

People subscribed via source and target branches