[tor-commits] [tor-messenger-build/master] Bug 18235: Disable Facebook as they no longer support XMPP

[sukhbir at torproject.org]

commit 477642edb5ef3ed04edffbdf3adf32a67c779b7a
Author: Sukhbir Singh <sukhbir at torproject.org>
Date:   Mon Feb 8 17:08:41 2016 -0500

    Bug 18235: Disable Facebook as they no longer support XMPP
---
 ChangeLog                                |  1 +
 projects/instantbird/config              |  1 +
 projects/instantbird/disable-fb.patch    | 41 ++++++++++++++++++++++++++++++++
 projects/instantbird/top-protocols.patch | 10 ++++----
 4 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b80fff2..43ddb54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@ Tor Messenger --
  * All Platforms
    * Bug 13795: Remove SPI root certificate because Debian no longer ships it
    * Bug 18094: Remove references to torbutton from start-tor-messenger script
+   * Bug 18235: Disable Facebook as they no longer support XMPP
  * Mac
    * Bug 17896: Add Edit menu to the conversation window on OS X
  * Windows
diff --git a/projects/instantbird/config b/projects/instantbird/config
index 8471b82..b0fb789 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -59,6 +59,7 @@ input_files:
   - filename: irc-default-server.patch
   - filename: top-protocols.patch
   - filename: disable-links.patch
+  - filename: disable-fb.patch
   - filename: account-picture.patch
   - filename: show-traffic-tor.patch
   - filename: hide-get-protocols.patch
diff --git a/projects/instantbird/disable-fb.patch b/projects/instantbird/disable-fb.patch
new file mode 100644
index 0000000..aee61f0
--- /dev/null
+++ b/projects/instantbird/disable-fb.patch
@@ -0,0 +1,41 @@
+diff --git a/chat/chat-prefs.js b/chat/chat-prefs.js
+--- a/chat/chat-prefs.js
++++ b/chat/chat-prefs.js
+@@ -82,6 +82,8 @@
+ pref("chat.irc.automaticList", true);
+ // Disable Skype until it can be tested further.
+ pref("chat.prpls.prpl-skype.disable", true);
++// Disable Facebook as the XMPP gateway no longer exists.
++pref("chat.prpls.prpl-facebook.disable", true);
+
+ // loglevel is the minimum severity level that a libpurple message
+ // must have to be reported in the Error Console.
+diff --git a/im/content/accountWizard.js b/im/content/accountWizard.js
+--- a/im/content/accountWizard.js
++++ b/im/content/accountWizard.js
+@@ -18,6 +18,13 @@
+       if (proto == null)
+         continue;
+
++      // If the preference is set to disable this prpl, don't show it in the
++      // full list of protocols.
++      let pref = "chat.prpls." + topProto + ".disable";
++      if (Services.prefs.getPrefType(pref) == Services.prefs.PREF_BOOL &&
++          Services.prefs.getBoolPref(pref))
++        continue;
++
+       let item = document.createElement("richlistitem");
+       item.className = "top-protocol";
+       topProtoList.insertBefore(item, document.getElementById("otherListItem"));
+diff --git a/im/installer/package-manifest.in b/im/installer/package-manifest.in
+--- a/im/installer/package-manifest.in
++++ b/im/installer/package-manifest.in
+@@ -227,8 +227,6 @@
+ @RESPATH@/components/imConversations.manifest
+ @RESPATH@/components/imCore.js
+ @RESPATH@/components/imCore.manifest
+- at RESPATH@/components/facebook.js
+- at RESPATH@/components/facebook.manifest
+ @RESPATH@/components/gtalk.js
+ @RESPATH@/components/gtalk.manifest
+ @RESPATH@/components/irc.js
diff --git a/projects/instantbird/top-protocols.patch b/projects/instantbird/top-protocols.patch
index b7202cc..59dbbe0 100644
--- a/projects/instantbird/top-protocols.patch
+++ b/projects/instantbird/top-protocols.patch
@@ -1,18 +1,20 @@
 diff --git a/im/locales/en-US/chrome/instantbird/accountWizard.properties b/im/locales/en-US/chrome/instantbird/accountWizard.properties
 --- a/im/locales/en-US/chrome/instantbird/accountWizard.properties
 +++ b/im/locales/en-US/chrome/instantbird/accountWizard.properties
-@@ -8,11 +8,13 @@
+@@ -8,13 +8,14 @@
  # Exceeding 4 protocols may cause scrolling. A list of the
  # available protocols can be found at
  #     https://wiki.instantbird.org/Protocol_Identifiers
 -topProtocol.list=prpl-gtalk,prpl-facebook,prpl-twitter,prpl-aim,prpl-yahoo
-+topProtocol.list=prpl-irc,prpl-jabber,prpl-gtalk,prpl-facebook
- 
++topProtocol.list=prpl-irc,prpl-jabber,prpl-twitter,prpl-gtalk
+
  # LOCALIZATION NOTE
  # These are the descriptions of the top protocols specified above.
  # A description should be provided for each protocol ID listed above.
 +topProtocol.prpl-irc.description=Connect to your favourite IRC network
 +topProtocol.prpl-jabber.description=Chat with friends using XMPP
  topProtocol.prpl-gtalk.description=Talk to your Gmail contacts
- topProtocol.prpl-facebook.description=Communicate with Facebook friends
+-topProtocol.prpl-facebook.description=Communicate with Facebook friends
  topProtocol.prpl-twitter.description=Stay up to date with your Twitter timeline
+ topProtocol.prpl-aim.description=Chat with your buddies on AOL Instant Messenger
+ topProtocol.prpl-yahoo.description=Chat with friends using Yahoo! Messenger