Merge lp:~ted/indicator-datetime/geoclue-fix into lp:indicator-datetime/0.3

Proposed by Ted Gould
Status: Merged
Merged at revision: 144
Proposed branch: lp:~ted/indicator-datetime/geoclue-fix
Merge into: lp:indicator-datetime/0.3
Diff against target: 17 lines (+6/-1)
1 file modified
src/datetime-service.c (+6/-1)
To merge this branch: bzr merge lp:~ted/indicator-datetime/geoclue-fix
Reviewer Review Type Date Requested Status
Conor Curran (community) Approve
Review via email: mp+80159@code.launchpad.net

Description of the change

Fixing the check for the client so the GeoClue feature actually works. Eh, no comment on why this was missed for so long :-/

To post a comment you must log in.
Revision history for this message
Conor Curran (cjcurran) :
review: Approve
145. By Ted Gould

Attaching bugs. Uhg

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/datetime-service.c'
2--- src/datetime-service.c 2011-10-13 04:30:40 +0000
3+++ src/datetime-service.c 2011-10-23 21:59:25 +0000
4@@ -1404,7 +1404,12 @@
5
6 geo_master = client;
7
8- if (geo_master != NULL) {
9+ if (error != NULL) {
10+ g_warning("Unable to get a GeoClue client! '%s' Geolocation based timezone support will not be available.", error->message);
11+ return;
12+ }
13+
14+ if (geo_master == NULL) {
15 g_warning(_("Unable to get a GeoClue client! Geolocation based timezone support will not be available."));
16 return;
17 }

Subscribers

People subscribed via source and target branches

to all changes: