From 0a0f7705fa39a7d6e351685930ef2475cf82fa05 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Sun, 4 Nov 2012 18:17:50 -0600 Subject: move geoclue variables to the geoclue section of the code --- src/datetime-service.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/datetime-service.c b/src/datetime-service.c index f8d673f..d326ebe 100644 --- a/src/datetime-service.c +++ b/src/datetime-service.c @@ -64,11 +64,9 @@ with this program. If not, see . #define SETTINGS_APP_INVOCATION "gnome-control-center datetime" #endif -static void geo_create_client (GeoclueMaster * master, GeoclueMasterClient * client, gchar * path, GError * error, gpointer user_data); static gboolean update_appointment_menu_items (gpointer user_data); static void update_location_menu_items (void); static void day_timer_reset (void); -static void geo_client_invalid (GeoclueMasterClient * client, gpointer user_data); static gboolean get_greeter_mode (void); static void quick_set_tz (DbusmenuMenuitem * menuitem, guint timestamp, gpointer user_data); @@ -96,10 +94,6 @@ static ESourceRegistry * source_registry = NULL; static GList * appointment_sources = NULL; -/* Geoclue trackers */ -static GeoclueMasterClient * geo_master = NULL; -static GeoclueAddress * geo_address = NULL; - /* Our 2 important timezones */ static gchar * current_timezone = NULL; static gchar * geo_timezone = NULL; @@ -1185,6 +1179,17 @@ system_proxy_cb (GObject * object, GAsyncResult * res, gpointer user_data) g_signal_connect(proxy, "g-signal", G_CALLBACK(session_active_change_cb), user_data); } + +/**** +***** GEOCLUE +****/ + +static void geo_create_client (GeoclueMaster * master, GeoclueMasterClient * client, gchar * path, GError * error, gpointer user_data); +static void geo_client_invalid (GeoclueMasterClient * client, gpointer user_data); + +static GeoclueMasterClient * geo_master = NULL; +static GeoclueAddress * geo_address = NULL; + static void geo_set_timezone (const gchar * timezone) { @@ -1339,6 +1344,10 @@ geo_create_client (GeoclueMaster * master, GeoclueMasterClient * client, gchar * return; } +/**** +***** +****/ + static gboolean get_greeter_mode (void) { -- cgit v1.2.3