1 files changed, 6 insertions, 26 deletions
diff --git a/applets/clock/clock-map.c b/applets/clock/clock-map.c
index 1aa2202e..97441c62 100644
--- a/applets/clock/clock-map.c
+++ b/applets/clock/clock-map.c
@@ -150,32 +150,15 @@ clock_map_finalize (GObject *g_obj)
 priv->highlight_timeout_id = 0;
 }
 
- if (priv->stock_map_pixbuf) {
- g_object_unref (priv->stock_map_pixbuf);
- priv->stock_map_pixbuf = NULL;
- }
+ g_clear_object (&priv->stock_map_pixbuf);
 
 for (i = 0; i < MARKER_NB; i++) {
- if (priv->location_marker_pixbuf[i]) {
- g_object_unref (priv->location_marker_pixbuf[i]);
- priv->location_marker_pixbuf[i] = NULL;
- }
+ g_clear_object (&priv->location_marker_pixbuf[i]);
 }
 
- if (priv->location_map_pixbuf) {
- g_object_unref (priv->location_map_pixbuf);
- priv->location_map_pixbuf = NULL;
- }
-
- if (priv->shadow_pixbuf) {
- g_object_unref (priv->shadow_pixbuf);
- priv->shadow_pixbuf = NULL;
- }
-
- if (priv->shadow_map_pixbuf) {
- g_object_unref (priv->shadow_map_pixbuf);
- priv->shadow_map_pixbuf = NULL;
- }
+ g_clear_object (&priv->location_map_pixbuf);
+ g_clear_object (&priv->shadow_pixbuf);
+ g_clear_object (&priv->shadow_map_pixbuf);
 
 G_OBJECT_CLASS (clock_map_parent_class)->finalize (g_obj);
 }
@@ -430,7 +413,6 @@ clock_map_place_locations (ClockMap *this)
 {
 ClockMapPrivate *priv = clock_map_get_instance_private (this);
 GSList *locs;
- ClockLocation *loc;
 
 if (priv->location_map_pixbuf) {
 g_object_unref (priv->location_map_pixbuf);
@@ -443,10 +425,8 @@ clock_map_place_locations (ClockMap *this)
 g_signal_emit (this, signals[NEED_LOCATIONS], 0, &locs);
 
 while (locs) {
- loc = CLOCK_LOCATION (locs->data);
-
+ ClockLocation *loc = CLOCK_LOCATION (locs->data);
 clock_map_place_location (this, loc, FALSE);
-
 locs = locs->next;
 }