Merge lp:~charlesk/indicator-datetime/lp-1251460 into lp:indicator-datetime/14.04

[Charles Kerr]

In src/clock-live.c, pass the right pointer to on_detect_location_changed().

clock-live.c has a private function with this signature:

> static void on_detect_location_changed (IndicatorDatetimeClockLive * self)

and indicator_datetime_clock_live_init() has this code:

> g_signal_connect (p->settings, "changed::" SETTINGS_SHOW_DETECTED_S,
> G_CALLBACK(on_detect_location_changed), self);

This should be _connect_swapped() s.t. self is passed to on_detect_location_changed().

[Ted Gould (ted)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/clock-live.c'
--- src/clock-live.c	2013-10-24 21:47:08 +0000
+++ src/clock-live.c	2013-11-14 22:54:10 +0000
@@ -259,9 +259,8 @@
   self->priv = p;
 
   p->settings = g_settings_new (SETTINGS_INTERFACE);
-  g_signal_connect (p->settings, "changed::" SETTINGS_SHOW_DETECTED_S,
-                    G_CALLBACK(on_detect_location_changed), self);
-
+  g_signal_connect_swapped (p->settings, "changed::" SETTINGS_SHOW_DETECTED_S,
+                            G_CALLBACK(on_detect_location_changed), self);
 
   on_detect_location_changed (self);
 }