[gnome-online-accounts] backend: Use goa_object_skeleton_attach_maps() helper

[Debarshi Ray <debarshir src gnome org>]

commit e1d97c51054d75405e63df2678758a12a4990553
Author: Christophe Fergeau <cfergeau redhat com>
Date:   Sun May 3 21:01:34 2015 +0200

    backend: Use goa_object_skeleton_attach_maps() helper
    
    https://bugzilla.gnome.org/show_bug.cgi?id=761510

 src/goabackend/goafacebookprovider.c   |   18 +-----------------
 src/goabackend/goafoursquareprovider.c |   18 ++----------------
 2 files changed, 3 insertions(+), 33 deletions(-)
---
diff --git a/src/goabackend/goafacebookprovider.c b/src/goabackend/goafacebookprovider.c
index a3eb6d6..c262a75 100644
--- a/src/goabackend/goafacebookprovider.c
+++ b/src/goabackend/goafacebookprovider.c
@@ -322,7 +322,6 @@ build_object (GoaProvider         *provider,
               GError             **error)
 {
   GoaAccount *account;
-  GoaMaps *maps = NULL;
   gboolean photos_enabled;
   gboolean maps_enabled;
   gboolean ret = FALSE;
@@ -356,22 +355,8 @@ build_object (GoaProvider         *provider,
     }
 
   /* Maps */
-  maps = goa_object_get_maps (GOA_OBJECT (object));
   maps_enabled = g_key_file_get_boolean (key_file, group, "MapsEnabled", NULL);
-
-  if (maps_enabled)
-    {
-      if (maps == NULL)
-        {
-          maps = goa_maps_skeleton_new ();
-          goa_object_skeleton_set_maps (object, maps);
-        }
-    }
-  else
-    {
-      if (maps != NULL)
-        goa_object_skeleton_set_maps (object, NULL);
-    }
+  goa_object_skeleton_attach_maps (object, maps_enabled);
 
   if (just_added)
     {
@@ -386,7 +371,6 @@ build_object (GoaProvider         *provider,
 
  out:
   g_clear_object (&account);
-  g_clear_object (&maps);
   return ret;
 }
 
diff --git a/src/goabackend/goafoursquareprovider.c b/src/goabackend/goafoursquareprovider.c
index a0f4b50..6aa4859 100644
--- a/src/goabackend/goafoursquareprovider.c
+++ b/src/goabackend/goafoursquareprovider.c
@@ -27,6 +27,7 @@
 #include "goaprovider-priv.h"
 #include "goaoauth2provider.h"
 #include "goafoursquareprovider.h"
+#include "goaobjectskeletonutils.h"
 
 /**
  * GoaFoursquareProvider:
@@ -325,7 +326,6 @@ build_object (GoaProvider         *provider,
               GError             **error)
 {
   GoaAccount *account = NULL;
-  GoaMaps *maps = NULL;
   gboolean maps_enabled;
   gboolean ret = FALSE;
 
@@ -342,21 +342,8 @@ build_object (GoaProvider         *provider,
   account = goa_object_get_account (GOA_OBJECT (object));
 
   /* Maps */
-  maps = goa_object_get_maps (GOA_OBJECT (object));
   maps_enabled = g_key_file_get_boolean (key_file, group, "MapsEnabled", NULL);
-  if (maps_enabled)
-    {
-      if (maps == NULL)
-        {
-          maps = goa_maps_skeleton_new ();
-          goa_object_skeleton_set_maps (object, maps);
-        }
-    }
-  else
-    {
-      if (maps != NULL)
-        goa_object_skeleton_set_maps (object, NULL);
-    }
+  goa_object_skeleton_attach_maps (object, maps_enabled);
 
   if (just_added)
     {
@@ -371,7 +358,6 @@ build_object (GoaProvider         *provider,
 
  out:
   g_clear_object (&account);
-  g_clear_object (&maps);
   return ret;
 }