commit d07428bfdc0179806550e6c5a3d253e7abfc7db2 Author: Arlo Breault arlolra@gmail.com Date: Fri Oct 24 11:47:20 2014 -0700

Add some more instantbird patches

* https://bugzilla.mozilla.org/show_bug.cgi?id=1088772

* Running tests w/o having built purplexpcom. --- projects/instantbird/config | 2 ++ projects/instantbird/null.patch | 36 +++++++++++++++++++++++++++++++ projects/instantbird/purple-tests.patch | 21 ++++++++++++++++++ 3 files changed, 59 insertions(+)

diff --git a/projects/instantbird/config b/projects/instantbird/config index 8e09efb..c655d63 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -40,6 +40,8 @@ input_files: - filename: accountcreation.patch - filename: prepare-messages-for-displaying.patch - filename: Send-raw-msgs-through-the-conversation-service.patch + - filename: null.patch + - filename: purple-tests.patch - filename: mozconfig - name: python project: python diff --git a/projects/instantbird/null.patch b/projects/instantbird/null.patch new file mode 100644 index 0000000..868f440 --- /dev/null +++ b/projects/instantbird/null.patch @@ -0,0 +1,36 @@ +# HG changeset patch +# User Arlo Breault arlolra@gmail.com +# Date 1414169680 25200 +# Fri Oct 24 09:54:40 2014 -0700 +# Node ID 358de61ab92e106fe0ffd877aa71371ceae0b87f +# Parent 7e72c5322e5c082b2472e0b07a06627e222f3864 +Prevent empty messages from falling back to the original + + * Irc will split up messages and empty lines fall back to the encrypted + message in OTR. + +diff --git a/chat/components/src/imConversations.js b/chat/components/src/imConversations.js +--- a/chat/components/src/imConversations.js ++++ b/chat/components/src/imConversations.js +@@ -29,17 +29,20 @@ function imMessage(aPrplMessage) { + } + imMessage.prototype = { + __proto__: ClassInfo(["imIMessage", "prplIMessage"], "IM Message"), + cancelled: false, + color: "", + _displayMessage: null, + + get displayMessage() { +- return this._displayMessage || this.prplMessage.originalMessage; ++ // Explicitly test for null so that blank messages don't fall back to ++ // the original. Especially problematic in encryption extensions like OTR. ++ return this._displayMessage !== null ? ++ this._displayMessage : this.prplMessage.originalMessage; + }, + set displayMessage(aMsg) { this._displayMessage = aMsg; }, + + get message() this.prplMessage.message, + set message(aMsg) { this.prplMessage.message = aMsg; }, + + // from prplIMessage + get who() this.prplMessage.who, diff --git a/projects/instantbird/purple-tests.patch b/projects/instantbird/purple-tests.patch new file mode 100644 index 0000000..a0f7671 --- /dev/null +++ b/projects/instantbird/purple-tests.patch @@ -0,0 +1,21 @@ +# HG changeset patch +# User Arlo Breault arlolra@gmail.com +# Date 1414176284 25200 +# Fri Oct 24 11:44:44 2014 -0700 +# Node ID 77ce49687f31b9634c2c32f76777a17d85e23b72 +# Parent 358de61ab92e106fe0ffd877aa71371ceae0b87f +Remove purple testing + +diff --git a/im/test/xpcshell.ini b/im/test/xpcshell.ini +--- a/im/test/xpcshell.ini ++++ b/im/test/xpcshell.ini +@@ -1,9 +1,8 @@ + ; This Source Code Form is subject to the terms of the Mozilla Public + ; License, v. 2.0. If a copy of the MPL was not distributed with this + ; file, You can obtain one at http://mozilla.org/MPL/2.0/. + + [include:chat/modules/test/xpcshell.ini] + [include:chat/components/src/test/xpcshell.ini] + [include:chat/protocols/irc/test/xpcshell.ini] + [include:chat/protocols/yahoo/test/xpcshell.ini] +-[include:extensions/purple/purplexpcom/src/test/xpcshell.ini]