Merge lp:~ted/indicator-datetime/lp1195874 into lp:~indicator-applet-developers/indicator-datetime/trunk.13.10

[Ted Gould]

Fix GeoClue signal handler to have proper prototype

Take care of the signal handler to have the prototype without the error but still call the handler function with a NULL error.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:250
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/86/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-saucy-amd64-ci/40
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-saucy-armhf-ci/41
        deb: http://jenkins.qa.ubuntu.com/job/indicator-datetime-saucy-armhf-ci/41/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-datetime-ci/86/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

Thanks Ted!

review: Approve

=== modified file 'src/timezone-geoclue.c'
--- src/timezone-geoclue.c	2013-06-14 20:59:13 +0000
+++ src/timezone-geoclue.c	2013-09-03 22:31:26 +0000
@@ -77,6 +77,18 @@
     }
 }
 
+/* The signal doesn't have the parameter for an error, so it ends up needing
+   a NULL inserted. */
+static void
+on_address_changed_sig (GeoclueAddress  * address     G_GNUC_UNUSED,
+                        int               timestamp   G_GNUC_UNUSED,
+                        GHashTable      * addy_data,
+                        GeoclueAccuracy * accuracy    G_GNUC_UNUSED,
+                        gpointer          gself)
+{
+  return on_address_changed(address, timestamp, addy_data, accuracy, NULL, gself);
+}
+
 static void
 on_address_created (GeoclueMasterClient * master   G_GNUC_UNUSED,
                     GeoclueAddress      * address,
@@ -95,7 +107,7 @@
       p->address = g_object_ref (address);
 
       geoclue_address_get_address_async (address, on_address_changed, gself);
-      g_signal_connect (address, "address-changed", G_CALLBACK(on_address_changed), gself);
+      g_signal_connect (address, "address-changed", G_CALLBACK(on_address_changed_sig), gself);
     }
 }
 
@@ -161,7 +173,7 @@
 
   if (p->address != NULL)
     {
-      g_signal_handlers_disconnect_by_func (p->address, on_address_changed, self);
+      g_signal_handlers_disconnect_by_func (p->address, on_address_changed_sig, self);
       g_clear_object (&p->address);
     }