diff options
Diffstat (limited to 'applets/clock/clock-location.c')
| -rw-r--r-- | applets/clock/clock-location.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/applets/clock/clock-location.c b/applets/clock/clock-location.c index 7ce1c129..637d834d 100644 --- a/applets/clock/clock-location.c +++ b/applets/clock/clock-location.c @@ -92,7 +92,7 @@ clock_location_find_and_ref (GSList *locations, } if (l != NULL) - return g_object_ref (CLOCK_LOCATION (l->data)); + return CLOCK_LOCATION (l->data); else return NULL; } @@ -210,17 +210,14 @@ clock_location_finalize (GObject *g_obj) G_CALLBACK (network_changed), CLOCK_LOCATION (g_obj)); - g_free (priv->name); - g_free (priv->city); + g_clear_pointer (&priv->name, g_free); + g_clear_pointer (&priv->city, g_free); - if (priv->systz) { - g_object_unref (priv->systz); - priv->systz = NULL; - } + g_clear_object (&priv->systz); - g_free (priv->timezone); - g_free (priv->tzname); - g_free (priv->weather_code); + g_clear_pointer (&priv->timezone, g_free); + g_clear_pointer (&priv->tzname, g_free); + g_clear_pointer (&priv->weather_code, g_free); if (priv->weather_info) { weather_info_free (priv->weather_info); @@ -437,7 +434,6 @@ clock_location_is_current (ClockLocation *loc) return FALSE; } - glong clock_location_get_offset (ClockLocation *loc) { |