diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2012-11-04 18:17:50 -0600 |
|---|---|---|
| committer | Charles Kerr <charles.kerr@canonical.com> | 2012-11-04 18:17:50 -0600 |
| commit | 0a0f7705fa39a7d6e351685930ef2475cf82fa05 (patch) | |
| tree | 932ed706216f960d9dc393ce727cc3dec970ae07 /src | |
| parent | e0956b83d773f47e92108c2ad21031e6f0efc757 (diff) | |
| download | ayatana-indicator-datetime-0a0f7705fa39a7d6e351685930ef2475cf82fa05.tar.gz ayatana-indicator-datetime-0a0f7705fa39a7d6e351685930ef2475cf82fa05.tar.bz2 ayatana-indicator-datetime-0a0f7705fa39a7d6e351685930ef2475cf82fa05.zip | |
move geoclue variables to the geoclue section of the code
Diffstat (limited to 'src')
| -rw-r--r-- | src/datetime-service.c | 21 |
1 files changed, 15 insertions, 6 deletions
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 <http://www.gnu.org/licenses/>. #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) { |