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

[Debarshi Ray <debarshir src gnome org>]

commit 9cd785b0e752543d14ff4372e36acce34b6f4d4d
Author: Christophe Fergeau <cfergeau redhat com>
Date:   Sun May 3 19:16:03 2015 +0200

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

 src/goabackend/goagoogleprovider.c    |   22 +---------------------
 src/goabackend/goatelepathyprovider.c |   19 ++-----------------
 2 files changed, 3 insertions(+), 38 deletions(-)
---
diff --git a/src/goabackend/goagoogleprovider.c b/src/goabackend/goagoogleprovider.c
index 0e17978..a5107f8 100644
--- a/src/goabackend/goagoogleprovider.c
+++ b/src/goabackend/goagoogleprovider.c
@@ -324,7 +324,6 @@ build_object (GoaProvider         *provider,
   GoaAccount *account;
   GoaMail *mail;
   gchar *uri_caldav;
-  GoaChat *chat;
   GoaPhotos *photos;
   GoaPrinters *printers;
   gchar *uri_drive;
@@ -341,7 +340,6 @@ build_object (GoaProvider         *provider,
 
   account = NULL;
   mail = NULL;
-  chat = NULL;
   photos = NULL;
   printers = NULL;
   ret = FALSE;
@@ -402,26 +400,9 @@ build_object (GoaProvider         *provider,
                                        contacts_enabled,
                                        FALSE);
 
-#ifdef GOA_TELEPATHY_ENABLED
   /* Chat */
-  chat = goa_object_get_chat (GOA_OBJECT (object));
   chat_enabled = g_key_file_get_boolean (key_file, group, "ChatEnabled", NULL);
-  if (chat_enabled)
-    {
-      if (chat == NULL)
-        {
-          chat = goa_chat_skeleton_new ();
-          goa_object_skeleton_set_chat (object, chat);
-        }
-    }
-  else
-    {
-      if (chat != NULL)
-        goa_object_skeleton_set_chat (object, NULL);
-    }
-#else
-  goa_object_skeleton_set_chat (object, NULL);
-#endif
+  goa_object_skeleton_attach_chat (object, chat_enabled);
 
   /* Documents */
   documents_enabled = g_key_file_get_boolean (key_file, group, "DocumentsEnabled", NULL);
@@ -519,7 +500,6 @@ build_object (GoaProvider         *provider,
  out:
   g_clear_object (&printers);
   g_clear_object (&photos);
-  g_clear_object (&chat);
   g_clear_object (&mail);
   g_clear_object (&account);
   return ret;
diff --git a/src/goabackend/goatelepathyprovider.c b/src/goabackend/goatelepathyprovider.c
index 931a71d..2bcd947 100644
--- a/src/goabackend/goatelepathyprovider.c
+++ b/src/goabackend/goatelepathyprovider.c
@@ -26,6 +26,7 @@
 #include "goaprovider.h"
 #include "goaprovider-priv.h"
 #include "goatelepathyprovider.h"
+#include "goaobjectskeletonutils.h"
 #include "goautils.h"
 
 typedef struct _GoaTelepathyProviderPrivate GoaTelepathyProviderPrivate;
@@ -711,12 +712,10 @@ build_object (GoaProvider        *provider,
               GError            **error)
 {
   GoaAccount *account;
-  GoaChat *chat;
   gboolean chat_enabled;
   gboolean ret;
 
   account = NULL;
-  chat = NULL;
   ret = FALSE;
 
   /* Chain up */
@@ -732,21 +731,8 @@ build_object (GoaProvider        *provider,
   account = goa_object_get_account (GOA_OBJECT (object));
 
   /* Chat */
-  chat = goa_object_get_chat (GOA_OBJECT (object));
   chat_enabled = g_key_file_get_boolean (key_file, group, "ChatEnabled", NULL);
-  if (chat_enabled)
-    {
-      if (chat == NULL)
-        {
-          chat = goa_chat_skeleton_new ();
-          goa_object_skeleton_set_chat (object, chat);
-        }
-    }
-  else
-    {
-      if (chat != NULL)
-        goa_object_skeleton_set_chat (object, NULL);
-    }
+  goa_object_skeleton_attach_chat (object, chat_enabled);
 
   if (just_added)
     {
@@ -760,7 +746,6 @@ build_object (GoaProvider        *provider,
   ret = TRUE;
 
 out:
-  g_clear_object (&chat);
   g_clear_object (&account);
   return ret;
 }