[gnome-photos] application: Don't use g_object_[gs]et_data

[Debarshi Ray <debarshir src gnome org>]

commit 6082679cd451423995abf768360bd228d2938e17
Author: Debarshi Ray <debarshir gnome org>
Date:   Fri Sep 22 17:50:43 2017 +0200

    application: Don't use g_object_[gs]et_data
    
    The use of a string-typed key means we don't benefit from compile-time
    checks. eg., the build won't fail if "settings" is mistyped as
    something else.

 src/photos-application.c |   32 +++++++++++++++++---------------
 1 files changed, 17 insertions(+), 15 deletions(-)
---
diff --git a/src/photos-application.c b/src/photos-application.c
index 0a10ab9..4943eb5 100644
--- a/src/photos-application.c
+++ b/src/photos-application.c
@@ -1426,11 +1426,9 @@ photos_application_set_bg_common_save_to_file (GObject *source_object, GAsyncRes
 
 
 static void
-photos_application_set_bg_common (PhotosApplication *self, GVariant *parameter, gpointer user_data)
+photos_application_set_bg_common (PhotosApplication *self, GSettings *settings)
 {
   GFile *backgrounds_file = NULL;
-  GSimpleAction *action = G_SIMPLE_ACTION (user_data);
-  GSettings *settings;
   PhotosApplicationSetBackgroundData *data;
   PhotosBaseItem *item;
   const gchar *config_dir;
@@ -1460,8 +1458,6 @@ photos_application_set_bg_common (PhotosApplication *self, GVariant *parameter,
   backgrounds_path = g_build_filename (backgrounds_dir, backgrounds_filename, NULL);
   backgrounds_file = g_file_new_for_path (backgrounds_path);
 
-  settings = G_SETTINGS (g_object_get_data (G_OBJECT (action), "settings"));
-
   data = photos_application_set_background_data_new (backgrounds_file, settings);
   photos_base_item_save_to_file_async (item,
                                        backgrounds_file,
@@ -1480,6 +1476,20 @@ photos_application_set_bg_common (PhotosApplication *self, GVariant *parameter,
 
 
 static void
+photos_application_set_background (PhotosApplication *self)
+{
+  photos_application_set_bg_common (self, self->bg_settings);
+}
+
+
+static void
+photos_application_set_screensaver (PhotosApplication *self)
+{
+  photos_application_set_bg_common (self, self->ss_settings);
+}
+
+
+static void
 photos_application_share_share (GObject *source_object, GAsyncResult *res, gpointer user_data)
 {
   PhotosApplication *self = PHOTOS_APPLICATION (user_data);
@@ -2031,19 +2041,11 @@ photos_application_startup (GApplication *application)
   g_action_map_add_action (G_ACTION_MAP (self), G_ACTION (self->selection_mode_action));
 
   self->set_bg_action = g_simple_action_new ("set-background", NULL);
-  g_object_set_data_full (G_OBJECT (self->set_bg_action),
-                          "settings",
-                          g_object_ref (self->bg_settings),
-                          g_object_unref);
-  g_signal_connect_swapped (self->set_bg_action, "activate", G_CALLBACK (photos_application_set_bg_common), 
self);
+  g_signal_connect_swapped (self->set_bg_action, "activate", G_CALLBACK (photos_application_set_background), 
self);
   g_action_map_add_action (G_ACTION_MAP (self), G_ACTION (self->set_bg_action));
 
   self->set_ss_action = g_simple_action_new ("set-screensaver", NULL);
-  g_object_set_data_full (G_OBJECT (self->set_ss_action),
-                          "settings",
-                          g_object_ref (self->ss_settings),
-                          g_object_unref);
-  g_signal_connect_swapped (self->set_ss_action, "activate", G_CALLBACK (photos_application_set_bg_common), 
self);
+  g_signal_connect_swapped (self->set_ss_action, "activate", G_CALLBACK 
(photos_application_set_screensaver), self);
   g_action_map_add_action (G_ACTION_MAP (self), G_ACTION (self->set_ss_action));
 
   self->share_action = g_simple_action_new ("share-current", NULL);