[tor-commits] [tor-messenger-build/master] Remove obsolete patches

[sukhbir at torproject.org]

commit 9cf4a0b5bf3d53e0ceeeb0c20dd73372073158e8
Author: Sukhbir Singh <sukhbir at torproject.org>
Date:   Fri Jan 30 22:50:30 2015 +0530

    Remove obsolete patches
---
 projects/instantbird/config          |    1 -
 projects/instantbird/facebook.patch  |   20 --------------------
 projects/instantbird/installer.patch |   20 +++++++++-----------
 projects/instantbird/irc.patch       |   12 ++----------
 4 files changed, 11 insertions(+), 42 deletions(-)

diff --git a/projects/instantbird/config b/projects/instantbird/config
index dfd0154..10e8fbb 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -62,7 +62,6 @@ input_files:
   - filename: irc.patch
   - filename: xmpp.patch
   - filename: xmpp-resource.patch
-  - filename: facebook.patch
   - filename: accountcreation.patch
   - filename: links.patch
   - filename: picture.patch
diff --git a/projects/instantbird/facebook.patch b/projects/instantbird/facebook.patch
deleted file mode 100644
index bb6fe05..0000000
--- a/projects/instantbird/facebook.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-# HG changeset patch
-# User Sukhbir Singh <sukhbir at torproject.org>
-# Date 1413962210 -19800
-#      Wed Oct 22 12:46:50 2014 +0530
-# Node ID ce691e5400583295a0cc0d0d43a3382a2f95940f
-# Parent  1172d3f8ed1dd3d7d6f892f4d123b109499e24d3
-Ensure TLS/SSL is used by default for Facebook accounts
-
-diff --git a/chat/protocols/facebook/facebook.js b/chat/protocols/facebook/facebook.js
---- a/chat/protocols/facebook/facebook.js
-+++ b/chat/protocols/facebook/facebook.js
-@@ -38,7 +38,7 @@
-     let server = "chat.facebook.com";
-     if (this.prefs.prefHasUserValue("server"))
-       server = this.getString("server");
--    this._connection = new XMPPSession(server, 5222, "opportunistic_tls",
-+    this._connection = new XMPPSession(server, 5222, "require_tls",
-                                        this._jid, this.imAccount.password,
-                                        this);
-   }
diff --git a/projects/instantbird/installer.patch b/projects/instantbird/installer.patch
index 8fca9bd..24641cf 100644
--- a/projects/instantbird/installer.patch
+++ b/projects/instantbird/installer.patch
@@ -1,15 +1,13 @@
 diff --git a/im/app/profile/Makefile.in b/im/app/profile/Makefile.in
-index 6de1a3d..ee71ede 100644
+index 4f48e97..bca1f17 100644
 --- a/im/app/profile/Makefile.in
 +++ b/im/app/profile/Makefile.in
-@@ -14,7 +14,8 @@ include $(topsrcdir)/config/rules.mk
- 
+@@ -15,6 +15,7 @@ include $(topsrcdir)/config/rules.mk
  FILES := \
- 	mimeTypes.rdf \
--    localstore.rdf \
-+	localstore.rdf \
-+	cert_override.txt \
- 	$(NULL)
+        mimeTypes.rdf \
+        localstore.rdf \
++       cert_override.txt
+        $(NULL)
  
  libs:: $(FILES)
 diff --git a/im/installer/Makefile.in b/im/installer/Makefile.in
@@ -22,13 +20,13 @@ index 396d5f8..deca57e 100644
  
 -NON_OMNIJAR_FILES =
 +NON_OMNIJAR_FILES = \
-+	defaults/profile/cert_override.txt \
-+	$(NULL)
++       defaults/profile/cert_override.txt \
++       $(NULL)
  
  ifndef LIBXUL_SDK
  INSTALL_SDK = 1
 diff --git a/im/installer/package-manifest.in b/im/installer/package-manifest.in
-index bda87fa..dfdd2d1 100644
+index a40698e..74abdca 100644
 --- a/im/installer/package-manifest.in
 +++ b/im/installer/package-manifest.in
 @@ -156,6 +156,7 @@
diff --git a/projects/instantbird/irc.patch b/projects/instantbird/irc.patch
index e1abc01..db5c3b1 100644
--- a/projects/instantbird/irc.patch
+++ b/projects/instantbird/irc.patch
@@ -1,8 +1,8 @@
 diff --git a/chat/protocols/irc/irc.js b/chat/protocols/irc/irc.js
-index e5be455..533be08 100644
+index d0c5c3f..450e105 100644
 --- a/chat/protocols/irc/irc.js
 +++ b/chat/protocols/irc/irc.js
-@@ -1833,13 +1833,13 @@ ircProtocol.prototype = {
+@@ -1914,7 +1914,7 @@ ircProtocol.prototype = {
  
    usernameSplits: [
      {get label() _("options.server"), separator: "@",
@@ -11,11 +11,3 @@ index e5be455..533be08 100644
    ],
  
    options: {
-     // TODO Default to IRC over SSL.
--    "port": {get label() _("options.port"), default: 6667},
--    "ssl": {get label() _("options.ssl"), default: false},
-+    "port": {get label() _("options.port"), default: 6697},
-+    "ssl": {get label() _("options.ssl"), default: true},
-     // TODO We should attempt to auto-detect encoding instead.
-     "encoding": {get label() _("options.encoding"), default: "UTF-8"},
-     "quitmsg": {get label() _("options.quitMessage"),