[gnome-online-accounts] backend: Use goa_object_skeleton_attach_files helper

[Debarshi Ray <debarshir src gnome org>]

commit 18255d9f67be11411a785961510df0b87cb32de8
Author: Christophe Fergeau <cfergeau redhat com>
Date:   Sun May 3 11:44:33 2015 +0200

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

 src/goabackend/goagoogleprovider.c   |   28 ++++------------------------
 src/goabackend/goaowncloudprovider.c |   29 ++++-------------------------
 2 files changed, 8 insertions(+), 49 deletions(-)
---
diff --git a/src/goabackend/goagoogleprovider.c b/src/goabackend/goagoogleprovider.c
index cd14643..1504577 100644
--- a/src/goabackend/goagoogleprovider.c
+++ b/src/goabackend/goagoogleprovider.c
@@ -327,9 +327,9 @@ build_object (GoaProvider         *provider,
   GoaContacts *contacts;
   GoaChat *chat;
   GoaDocuments *documents;
-  GoaFiles *files;
   GoaPhotos *photos;
   GoaPrinters *printers;
+  gchar *uri_drive;
   gboolean ret;
   gboolean mail_enabled;
   gboolean calendar_enabled;
@@ -346,7 +346,6 @@ build_object (GoaProvider         *provider,
   contacts = NULL;
   chat = NULL;
   documents = NULL;
-  files = NULL;
   photos = NULL;
   printers = NULL;
   ret = FALSE;
@@ -478,28 +477,10 @@ build_object (GoaProvider         *provider,
     }
 
   /* Files */
-  files = goa_object_get_files (GOA_OBJECT (object));
   files_enabled = g_key_file_get_boolean (key_file, group, "FilesEnabled", NULL);
-  if (files_enabled)
-    {
-      if (files == NULL)
-        {
-          gchar *uri_drive;
-
-          uri_drive = g_strconcat ("google-drive://", email_address, "/", NULL);
-          files = goa_files_skeleton_new ();
-          g_object_set (G_OBJECT (files),
-                        "uri", uri_drive,
-                        NULL);
-          goa_object_skeleton_set_files (object, files);
-          g_free (uri_drive);
-        }
-    }
-  else
-    {
-      if (files != NULL)
-        goa_object_skeleton_set_files (object, NULL);
-    }
+  uri_drive = g_strconcat ("google-drive://", email_address, "/", NULL);
+  goa_object_skeleton_attach_files (object, uri_drive, files_enabled, FALSE);
+  g_free (uri_drive);
 
   /* Printers */
   printers = goa_object_get_printers (GOA_OBJECT (object));
@@ -568,7 +549,6 @@ build_object (GoaProvider         *provider,
 
  out:
   g_clear_object (&printers);
-  g_clear_object (&files);
   g_clear_object (&photos);
   g_clear_object (&documents);
   g_clear_object (&chat);
diff --git a/src/goabackend/goaowncloudprovider.c b/src/goabackend/goaowncloudprovider.c
index 72e49ef..9d436f4 100644
--- a/src/goabackend/goaowncloudprovider.c
+++ b/src/goabackend/goaowncloudprovider.c
@@ -146,9 +146,9 @@ build_object (GoaProvider         *provider,
 {
   GoaAccount *account;
   gchar *uri_caldav;
+  gchar *uri_webdav;
   GoaContacts *contacts;
   GoaDocuments *documents;
-  GoaFiles *files;
   GoaPasswordBased *password_based;
   SoupURI *uri;
   gboolean accept_ssl_errors;
@@ -163,7 +163,6 @@ build_object (GoaProvider         *provider,
   account = NULL;
   contacts = NULL;
   documents = NULL;
-  files = NULL;
   password_based = NULL;
   uri = NULL;
   uri_string = NULL;
@@ -253,29 +252,10 @@ build_object (GoaProvider         *provider,
     }
 
   /* Files */
-  files = goa_object_get_files (GOA_OBJECT (object));
   files_enabled = g_key_file_get_boolean (key_file, group, "FilesEnabled", NULL);
-  if (files_enabled)
-    {
-      if (files == NULL)
-        {
-          gchar *uri_webdav;
-
-          uri_webdav = get_webdav_uri (uri);
-          files = goa_files_skeleton_new ();
-          g_object_set (G_OBJECT (files),
-                        "accept-ssl-errors", accept_ssl_errors,
-                        "uri", uri_webdav,
-                        NULL);
-          goa_object_skeleton_set_files (object, files);
-          g_free (uri_webdav);
-        }
-    }
-  else
-    {
-      if (files != NULL)
-        goa_object_skeleton_set_files (object, NULL);
-    }
+  uri_webdav = get_webdav_uri (uri);
+  goa_object_skeleton_attach_files (object, uri_webdav, files_enabled, accept_ssl_errors);
+  g_free (uri_webdav);
 
   if (just_added)
     {
@@ -307,7 +287,6 @@ build_object (GoaProvider         *provider,
  out:
   g_clear_object (&contacts);
   g_clear_object (&documents);
-  g_clear_object (&files);
   g_clear_object (&password_based);
   g_clear_pointer (&uri, (GDestroyNotify *) soup_uri_free);
   g_free (uri_string);