[gnome-photos] Use g_set_object wherever applicable

[Debarshi Ray <debarshir src gnome org>]

commit b1056132df018a218adc5464d8b7a18c87f97374
Author: Debarshi Ray <debarshir gnome org>
Date:   Fri Jul 8 10:37:10 2016 +0200

    Use g_set_object wherever applicable

 src/photos-base-item.c       |    9 ++-------
 src/photos-fetch-metas-job.c |    5 +----
 src/photos-item-manager.c    |    3 +--
 src/photos-tool-filters.c    |    4 +---
 4 files changed, 5 insertions(+), 16 deletions(-)
---
diff --git a/src/photos-base-item.c b/src/photos-base-item.c
index 4c76b23..57922ce 100644
--- a/src/photos-base-item.c
+++ b/src/photos-base-item.c
@@ -325,10 +325,7 @@ photos_base_item_set_original_icon (PhotosBaseItem *self, GdkPixbuf *icon)
   PhotosBaseItemPrivate *priv = self->priv;
 
   if (icon != NULL)
-    {
-      g_clear_object (&priv->original_icon);
-      priv->original_icon = g_object_ref (icon);
-    }
+    g_set_object (&priv->original_icon, icon);
 
   photos_base_item_check_effects_and_update_info (self);
 }
@@ -2749,14 +2746,12 @@ photos_base_item_set_default_app (PhotosBaseItem *self, GAppInfo *default_app)
   if (priv->default_app != NULL && default_app != NULL && g_app_info_equal (priv->default_app, default_app))
     return;
 
-  g_clear_object (&priv->default_app);
+  g_set_object (&priv->default_app, default_app);
   g_clear_pointer (&priv->default_app_name, g_free);
 
   if (default_app == NULL)
     return;
 
-  priv->default_app = g_object_ref (default_app);
-
   default_app_name = g_app_info_get_name (default_app);
   priv->default_app_name = g_strdup (default_app_name);
 }
diff --git a/src/photos-fetch-metas-job.c b/src/photos-fetch-metas-job.c
index 6ce8872..2f8ede6 100644
--- a/src/photos-fetch-metas-job.c
+++ b/src/photos-fetch-metas-job.c
@@ -122,10 +122,7 @@ photos_fetch_metas_job_create_collection_icon_executed (GObject *source_object,
     }
 
   if (icon != NULL)
-    {
-      g_clear_object (&meta->icon);
-      meta->icon = g_object_ref (icon);
-    }
+    g_set_object (&meta->icon, icon);
 
   self->metas = g_list_prepend (self->metas, meta);
   photos_fetch_metas_job_collector (self);
diff --git a/src/photos-item-manager.c b/src/photos-item-manager.c
index 0aaae8f..f8f3067 100644
--- a/src/photos-item-manager.c
+++ b/src/photos-item-manager.c
@@ -362,8 +362,7 @@ photos_item_manager_set_active_object (PhotosBaseManager *manager, GObject *obje
       g_queue_push_head (self->collection_path,
                          (self->active_collection != NULL) ? g_object_ref (self->active_collection) : NULL);
 
-      g_clear_object (&self->active_collection);
-      self->active_collection = g_object_ref (object);
+      g_set_object (&self->active_collection, PHOTOS_BASE_ITEM (object));
       self->load_state = PHOTOS_LOAD_STATE_NONE;
       active_collection_changed = TRUE;
     }
diff --git a/src/photos-tool-filters.c b/src/photos-tool-filters.c
index efa51b5..a093a71 100644
--- a/src/photos-tool-filters.c
+++ b/src/photos-tool-filters.c
@@ -111,9 +111,7 @@ photos_tool_filters_activate (PhotosTool *tool, PhotosBaseItem *item, PhotosImag
   if (self->buttons == NULL || self->create_preview_id != 0)
     goto out;
 
-  g_clear_object (&self->item);
-  self->item = g_object_ref (item);
-
+  g_set_object (&self->item, item);
   self->create_preview_id = g_idle_add_full (G_PRIORITY_LOW, photos_tool_filters_create_preview_idle, self, 
NULL);
 
   if (photos_base_item_operation_get (item, "photos:insta-filter", "preset", &preset, NULL))