diff -Nru gnome-online-accounts-3.14.2/debian/changelog gnome-online-accounts-3.14.2/debian/changelog --- gnome-online-accounts-3.14.2/debian/changelog 2014-12-05 08:51:05.000000000 +1100 +++ gnome-online-accounts-3.14.2/debian/changelog 2015-03-17 09:09:09.000000000 +1100 @@ -1,3 +1,13 @@ +gnome-online-accounts (3.14.2-1ubuntu1) vivid; urgency=medium + + * debian/patches/git_facebook_remove_chat.patch: Facebook have dropped + support for XMPP (LP: #1432859) + * debian/patches/git_facebook_remove_read_mailbox.patch: removed unused + permission that is restricted usage. + + + -- Tim Lunn Tue, 17 Mar 2015 08:57:21 +1100 + gnome-online-accounts (3.14.2-1) unstable; urgency=medium * New upstream bugfix release diff -Nru gnome-online-accounts-3.14.2/debian/patches/git_facebook_remove_chat.patch gnome-online-accounts-3.14.2/debian/patches/git_facebook_remove_chat.patch --- gnome-online-accounts-3.14.2/debian/patches/git_facebook_remove_chat.patch 1970-01-01 10:00:00.000000000 +1000 +++ gnome-online-accounts-3.14.2/debian/patches/git_facebook_remove_chat.patch 2015-03-17 08:56:23.000000000 +1100 @@ -0,0 +1,161 @@ +From 252937bcda7797ddabeebf85827e3cd48944ec03 Mon Sep 17 00:00:00 2001 +From: Debarshi Ray +Date: Mon, 23 Feb 2015 12:18:32 +0100 +Subject: 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 + +diff --git a/src/goabackend/goafacebookprovider.c b/src/goabackend/goafacebookprovider.c +index ceb897e..771ee9c 100644 +--- a/src/goabackend/goafacebookprovider.c ++++ b/src/goabackend/goafacebookprovider.c +@@ -86,7 +86,6 @@ static GoaProviderFeatures + get_provider_features (GoaProvider *_provider) + { + return GOA_PROVIDER_FEATURE_BRANDED | +- GOA_PROVIDER_FEATURE_CHAT | + GOA_PROVIDER_FEATURE_PHOTOS | + GOA_PROVIDER_FEATURE_MAPS; + } +@@ -135,7 +134,6 @@ get_scope (GoaOAuth2Provider *provider) + return + "user_events," + "read_mailbox," +- "xmpp_login," + "email," + "user_photos," + "user_status," +@@ -145,7 +143,7 @@ get_scope (GoaOAuth2Provider *provider) + static guint + get_credentials_generation (GoaProvider *provider) + { +- return 2; ++ return 3; + } + + static const gchar * +@@ -330,10 +328,8 @@ build_object (GoaProvider *provider, + GError **error) + { + GoaAccount *account; +- GoaChat *chat = NULL; + GoaPhotos *photos = NULL; + GoaMaps *maps = NULL; +- gboolean chat_enabled; + gboolean photos_enabled; + gboolean maps_enabled; + gboolean ret = FALSE; +@@ -352,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); +@@ -436,7 +406,6 @@ build_object (GoaProvider *provider, + ret = TRUE; + + out: +- g_clear_object (&chat); + g_clear_object (&account); + g_clear_object (&photos); + g_clear_object (&maps); +@@ -460,13 +429,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")); +@@ -483,7 +445,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"); + g_variant_builder_add (builder, "{ss}", "MapsEnabled", "true"); + } +diff --git a/src/goabackend/goatelepathyfactory.c b/src/goabackend/goatelepathyfactory.c +index b0793cb..be28690 100644 +--- a/src/goabackend/goatelepathyfactory.c ++++ b/src/goabackend/goatelepathyfactory.c +@@ -72,10 +72,8 @@ get_protocols_cb (GObject *source, + GList *ret; + GList *l; + GError *error = NULL; +- +-#if GOA_FACEBOOK_ENABLED + GQuark facebook_quark; +-#endif ++ + #if GOA_GOOGLE_ENABLED + GQuark google_talk_quark; + #endif +@@ -88,9 +86,8 @@ get_protocols_cb (GObject *source, + return; + } + +-#if GOA_FACEBOOK_ENABLED + facebook_quark = g_quark_from_static_string ("facebook"); +-#endif ++ + #if GOA_GOOGLE_ENABLED + google_talk_quark = g_quark_from_static_string ("google-talk"); + #endif +@@ -103,12 +100,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; +-- +cgit v0.10.2 + + diff -Nru gnome-online-accounts-3.14.2/debian/patches/git_facebook_remove_read_mailbox.patch gnome-online-accounts-3.14.2/debian/patches/git_facebook_remove_read_mailbox.patch --- gnome-online-accounts-3.14.2/debian/patches/git_facebook_remove_read_mailbox.patch 1970-01-01 10:00:00.000000000 +1000 +++ gnome-online-accounts-3.14.2/debian/patches/git_facebook_remove_read_mailbox.patch 2015-03-17 08:57:04.000000000 +1100 @@ -0,0 +1,29 @@ +From 68a2fe409618150344688fd98ddd5d5e92d7dd1e Mon Sep 17 00:00:00 2001 +From: Debarshi Ray +Date: Mon, 23 Feb 2015 13:24:16 +0100 +Subject: facebook: Remove read_mailbox + +I can not think of anything that is using it, and Facebook does not +like [1] handing it out so easily. + +Since the credentials generation was bumped in the previous commit, +we are not bumping it again. + +[1] https://developers.facebook.com/docs/facebook-login/permissions + +https://bugzilla.gnome.org/show_bug.cgi?id=745004 + +diff --git a/src/goabackend/goafacebookprovider.c b/src/goabackend/goafacebookprovider.c +index 771ee9c..27ccd62 100644 +--- a/src/goabackend/goafacebookprovider.c ++++ b/src/goabackend/goafacebookprovider.c +@@ -133,7 +133,6 @@ get_scope (GoaOAuth2Provider *provider) + /* Note: Email is requested to obtain a human understandable unique Id */ + return + "user_events," +- "read_mailbox," + "email," + "user_photos," + "user_status," +-- +cgit v0.10.2 diff -Nru gnome-online-accounts-3.14.2/debian/patches/series gnome-online-accounts-3.14.2/debian/patches/series --- gnome-online-accounts-3.14.2/debian/patches/series 1970-01-01 10:00:00.000000000 +1000 +++ gnome-online-accounts-3.14.2/debian/patches/series 2015-03-17 08:57:11.000000000 +1100 @@ -0,0 +1,2 @@ +git_facebook_remove_chat.patch +git_facebook_remove_read_mailbox.patch