From d2886daf97d85423d458830ec57c4024712b0b32 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 21 Oct 2010 17:36:01 -0400 Subject: Whitespace --- src/datetime-service.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/datetime-service.c b/src/datetime-service.c index b4a1135..4eee211 100644 --- a/src/datetime-service.c +++ b/src/datetime-service.c @@ -418,8 +418,13 @@ geo_create_client (GeoclueMaster * master, GeoclueMasterClient * client, gchar * geo_master = client; - geoclue_master_client_set_requirements_async(geo_master, GEOCLUE_ACCURACY_LEVEL_REGION, 0, - FALSE, GEOCLUE_RESOURCE_ALL, geo_req_set, NULL); + geoclue_master_client_set_requirements_async(geo_master, + GEOCLUE_ACCURACY_LEVEL_REGION, + 0, + FALSE, + GEOCLUE_RESOURCE_ALL, + geo_req_set, + NULL); geoclue_master_client_create_address_async(geo_master, geo_create_address, NULL); -- cgit v1.2.3 From cc5d5780cb01c1ceebc1da10f1329b16eab27749 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 22 Oct 2010 09:12:20 -0400 Subject: Setting up callbacks for the signals off of the clients --- src/datetime-service.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/datetime-service.c b/src/datetime-service.c index 4eee211..7148c69 100644 --- a/src/datetime-service.c +++ b/src/datetime-service.c @@ -410,6 +410,23 @@ geo_req_set (GeoclueMasterClient * master, GError * error, gpointer user_data) return; } +/* Client is killing itself rather oddly */ +static void +geo_client_invalid (GeoclueMasterClient * client, gpointer user_data) +{ + + return; +} + +/* Address provider changed, we need to get that one */ +static void +geo_address_change (GeoclueMasterClient * client, gchar * a, gchar * b, gchar * c, gchar * d, gpointer user_data) +{ + + + return; +} + /* Callback from creating the client */ static void geo_create_client (GeoclueMaster * master, GeoclueMasterClient * client, gchar * path, GError * error, gpointer user_data) @@ -428,6 +445,9 @@ geo_create_client (GeoclueMaster * master, GeoclueMasterClient * client, gchar * geoclue_master_client_create_address_async(geo_master, geo_create_address, NULL); + g_signal_connect(G_OBJECT(client), "invalidated", G_CALLBACK(geo_client_invalid), NULL); + g_signal_connect(G_OBJECT(client), "address-provider-changed", G_CALLBACK(geo_address_change), NULL); + return; } -- cgit v1.2.3 From 1fdf38754c8f332a5b2e385b8f9d781e8669cf72 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 22 Oct 2010 09:22:00 -0400 Subject: Filling out the changing callbacks --- src/datetime-service.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/src/datetime-service.c b/src/datetime-service.c index 7148c69..70c37cd 100644 --- a/src/datetime-service.c +++ b/src/datetime-service.c @@ -38,6 +38,7 @@ with this program. If not, see . #include "datetime-interface.h" #include "dbus-shared.h" +static void geo_create_client (GeoclueMaster * master, GeoclueMasterClient * client, gchar * path, GError * error, gpointer user_data); static void setup_timer (void); static IndicatorService * service = NULL; @@ -394,6 +395,7 @@ geo_create_address (GeoclueMasterClient * master, GeoclueAddress * address, GErr g_debug("Created Geoclue Address"); geo_address = address; + g_object_ref(G_OBJECT(geo_address)); geoclue_address_get_address_async(geo_address, geo_address_cb, NULL); @@ -414,6 +416,22 @@ geo_req_set (GeoclueMasterClient * master, GError * error, gpointer user_data) static void geo_client_invalid (GeoclueMasterClient * client, gpointer user_data) { + g_warning("Master client invalid, rebuilding."); + + if (geo_master != NULL) { + g_object_unref(G_OBJECT(geo_master)); + } + geo_master = NULL; + + GeoclueMaster * master = geoclue_master_get_default(); + geoclue_master_create_client_async(master, geo_create_client, NULL); + + if (geo_timezone != NULL) { + g_free(geo_timezone); + geo_timezone = NULL; + } + + check_timezone_sync(); return; } @@ -422,7 +440,21 @@ geo_client_invalid (GeoclueMasterClient * client, gpointer user_data) static void geo_address_change (GeoclueMasterClient * client, gchar * a, gchar * b, gchar * c, gchar * d, gpointer user_data) { + g_warning("Address provider changed. Let's change"); + + if (geo_address != NULL) { + g_object_unref(G_OBJECT(geo_address)); + } + geo_address = NULL; + geoclue_master_client_create_address_async(geo_master, geo_create_address, NULL); + + if (geo_timezone != NULL) { + g_free(geo_timezone); + geo_timezone = NULL; + } + + check_timezone_sync(); return; } @@ -434,6 +466,7 @@ geo_create_client (GeoclueMaster * master, GeoclueMasterClient * client, gchar * g_debug("Created Geoclue client at: %s", path); geo_master = client; + g_object_ref(G_OBJECT(geo_master)); geoclue_master_client_set_requirements_async(geo_master, GEOCLUE_ACCURACY_LEVEL_REGION, -- cgit v1.2.3 From 1149b84d2b7b8c22f27f8acc507ed8af7342345f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 22 Oct 2010 09:31:37 -0400 Subject: Setting up a callback for the address changing. --- src/datetime-service.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/datetime-service.c b/src/datetime-service.c index 70c37cd..8a31940 100644 --- a/src/datetime-service.c +++ b/src/datetime-service.c @@ -399,6 +399,8 @@ geo_create_address (GeoclueMasterClient * master, GeoclueAddress * address, GErr geoclue_address_get_address_async(geo_address, geo_address_cb, NULL); + g_signal_connect(G_OBJECT(address), "address-changed", G_CALLBACK(geo_address_cb), NULL); + return; } -- cgit v1.2.3