aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2012-09-13 06:56:39 +0000
committerTarmac <Unknown>2012-09-13 06:56:39 +0000
commit4e28e95f3bf1320fa92e88f6f103eab5a3812efa (patch)
treeef271f216ba6e2600e844488757004f053544f93
parentf761233cf8bd2e201b77fdfd2d502dc401a37238 (diff)
parenteedc75e2b8ace2c569bcd386d61c1d76d5d2f135 (diff)
downloadayatana-indicator-datetime-4e28e95f3bf1320fa92e88f6f103eab5a3812efa.tar.gz
ayatana-indicator-datetime-4e28e95f3bf1320fa92e88f6f103eab5a3812efa.tar.bz2
ayatana-indicator-datetime-4e28e95f3bf1320fa92e88f6f103eab5a3812efa.zip
No longer watch if the address provider changes. Approved by Charles Kerr, jenkins.
-rw-r--r--src/datetime-service.c25
1 files changed, 0 insertions, 25 deletions
diff --git a/src/datetime-service.c b/src/datetime-service.c
index 86c677a..6b06b45 100644
--- a/src/datetime-service.c
+++ b/src/datetime-service.c
@@ -63,7 +63,6 @@ static gboolean update_appointment_menu_items (gpointer user_data);
static void update_location_menu_items (void);
static void setup_timer (void);
static void 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);
static gboolean get_greeter_mode (void);
static void quick_set_tz (DbusmenuMenuitem * menuitem, guint timestamp, gpointer user_data);
@@ -1258,7 +1257,6 @@ geo_client_clean (void)
}
g_signal_handlers_disconnect_by_func(G_OBJECT(geo_master), geo_client_invalid, NULL);
- g_signal_handlers_disconnect_by_func(G_OBJECT(geo_master), geo_address_change, NULL);
g_object_unref(G_OBJECT(geo_master));
geo_master = NULL;
@@ -1330,28 +1328,6 @@ 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)
-{
- g_warning("Address provider changed. Let's change");
-
- /* If the address is supposed to have changed we need to drop the old
- address before starting to get the new one. */
- geo_address_clean();
-
- geoclue_master_client_create_address_async(geo_master, geo_create_address, NULL);
-
- if (geo_timezone != NULL) {
- g_free(geo_timezone);
- geo_timezone = NULL;
- }
-
- update_location_menu_items();
-
- return;
-}
-
/* Callback from creating the client */
static void
geo_create_client (GeoclueMaster * master, GeoclueMasterClient * client, gchar * path, GError * error, gpointer user_data)
@@ -1387,7 +1363,6 @@ 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;
}