[gnome-online-accounts/gnome-3-12] facebook: Remove chat support

[Debarshi Ray <debarshir src gnome org>]

commit bc52365b95ff3434a9daec9fcef6997929e6ecff
Author: Debarshi Ray <debarshir gnome org>
Date:   Mon Feb 23 12:18:32 2015 +0100

    facebook: Remove chat support
    
    Facebook has dropped support for XMPP in version 2.0 of the Graph API.
    There is no known alternative for this.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=745004

 src/goabackend/goafacebookprovider.c |   43 +--------------------------------
 src/goabackend/goatelepathyfactory.c |    8 +++---
 2 files changed, 6 insertions(+), 45 deletions(-)
---
diff --git a/src/goabackend/goafacebookprovider.c b/src/goabackend/goafacebookprovider.c
index 36f597a..8989041 100644
--- a/src/goabackend/goafacebookprovider.c
+++ b/src/goabackend/goafacebookprovider.c
@@ -88,7 +88,7 @@ get_provider_group (GoaProvider *_provider)
 static GoaProviderFeatures
 get_provider_features (GoaProvider *_provider)
 {
-  return GOA_PROVIDER_FEATURE_BRANDED | GOA_PROVIDER_FEATURE_CHAT | GOA_PROVIDER_FEATURE_PHOTOS;
+  return GOA_PROVIDER_FEATURE_BRANDED | GOA_PROVIDER_FEATURE_PHOTOS;
 }
 
 /* facebook client flow sends a different auth query then the base
@@ -135,7 +135,6 @@ get_scope (GoaOAuth2Provider *provider)
   return
     "user_events,"
     "read_mailbox,"
-    "xmpp_login,"
     "email,"
     "user_photos";
 }
@@ -143,7 +142,7 @@ get_scope (GoaOAuth2Provider *provider)
 static guint
 get_credentials_generation (GoaProvider *provider)
 {
-  return 1;
+  return 2;
 }
 
 static const gchar *
@@ -331,9 +330,7 @@ build_object (GoaProvider         *provider,
               GError             **error)
 {
   GoaAccount *account;
-  GoaChat *chat = NULL;
   GoaPhotos *photos = NULL;
-  gboolean chat_enabled;
   gboolean photos_enabled;
   gboolean ret = FALSE;
 
@@ -351,32 +348,6 @@ 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);
-    }
-
-  if (just_added)
-    {
-      goa_account_set_chat_disabled (account, !chat_enabled);
-      g_signal_connect (account,
-                        "notify::chat-disabled",
-                        G_CALLBACK (goa_util_account_notify_property_cb),
-                        "ChatEnabled");
-    }
-
   /* Photos */
   photos = goa_object_get_photos (GOA_OBJECT (object));
   photos_enabled = g_key_file_get_boolean (key_file, group, "PhotosEnabled", NULL);
@@ -408,8 +379,6 @@ build_object (GoaProvider         *provider,
   ret = TRUE;
 
  out:
-  if (chat != NULL)
-    g_object_unref (chat);
   if (account != NULL)
     g_object_unref (account);
   g_clear_object (&photos);
@@ -433,13 +402,6 @@ show_account (GoaProvider         *provider,
   goa_util_add_account_info (grid, row++, object);
 
   goa_util_add_row_switch_from_keyfile_with_blurb (grid, row++, object,
-                                                   /* Translators: This is a label for a series of
-                                                    * options switches. For example: “Use for Mail”. */
-                                                   _("Use for"),
-                                                   "chat-disabled",
-                                                   _("C_hat"));
-
-  goa_util_add_row_switch_from_keyfile_with_blurb (grid, row++, object,
                                                    NULL,
                                                    "photos-disabled",
                                                    _("_Photos"));
@@ -451,7 +413,6 @@ static void
 add_account_key_values (GoaOAuth2Provider *provider,
                         GVariantBuilder   *builder)
 {
-  g_variant_builder_add (builder, "{ss}", "ChatEnabled", "true");
   g_variant_builder_add (builder, "{ss}", "PhotosEnabled", "true");
 }
 
diff --git a/src/goabackend/goatelepathyfactory.c b/src/goabackend/goatelepathyfactory.c
index 3fd9e5d..56425dd 100644
--- a/src/goabackend/goatelepathyfactory.c
+++ b/src/goabackend/goatelepathyfactory.c
@@ -95,12 +95,12 @@ get_protocols_cb (GObject      *source,
       GQuark service_quark = g_quark_try_string (service_name);
       GoaTelepathyProvider *provider;
 
-      /* If the  service is handled natively by GOA, so we don't allow
-       * the creation of a Telepathy-only account. */
-#if GOA_FACEBOOK_ENABLED
+      /* This service does not exist anymore, so skip it. */
       if (service_quark == facebook_quark)
         continue;
-#endif
+
+      /* If the  service is handled natively by GOA, so we don't allow
+       * the creation of a Telepathy-only account. */
 #if GOA_GOOGLE_ENABLED
       if (service_quark == google_talk_quark)
         continue;