From ad4d799e778a7c31c4c10e77fac4053e71ac9a75 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Fri, 3 May 2013 14:29:45 -0700 Subject: avoid pointer comparisons in set_timezone() --- src/location-geoclue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/location-geoclue.c b/src/location-geoclue.c index 2e57f39..87358fb 100644 --- a/src/location-geoclue.c +++ b/src/location-geoclue.c @@ -52,7 +52,7 @@ set_timezone (IndicatorDatetimeLocationGeoclue * self, const gchar * timezone) { priv_t * p = self->priv; - if (p->timezone != timezone) + if (g_strcmp0 (p->timezone, timezone)) { g_free (p->timezone); p->timezone = g_strdup (timezone); -- cgit v1.2.3 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(-) 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