From ec7db5b53511247719434175951c2fb9daefd0f2 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Fri, 3 May 2013 14:31:45 -0700 Subject: make the flow in on_use_geoclue_changed_cb() a little easier to read --- src/datetime-service.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/datetime-service.c b/src/datetime-service.c index 52d9647..ff22db5 100644 --- a/src/datetime-service.c +++ b/src/datetime-service.c @@ -1255,16 +1255,15 @@ on_use_geoclue_changed_cb (GSettings *settings, gchar *key G_GNUC_UNUSED, gpointer user_data G_GNUC_UNUSED) { - const gboolean using = geo_location != NULL; - const gboolean should_use = g_settings_get_boolean (conf, "show-auto-detected-location"); + const gboolean use_geoclue = g_settings_get_boolean (conf, "show-auto-detected-location"); - if (using && !should_use) + if (geo_location && !use_geoclue) { g_signal_handlers_disconnect_by_func (geo_location, update_location_menu_items, 0); g_clear_object (&geo_location); update_location_menu_items (); } - else if (should_use && !using) + else if (use_geoclue && !geo_location) { geo_location = indicator_datetime_location_geoclue_new (); g_signal_connect (geo_location, "notify::timezone", -- cgit v1.2.3