commit f1318bb3eb2a55c4efa7ac5fe83d4282b2718935 Author: Arlo Breault arlolra@gmail.com Date: Tue Oct 28 20:17:27 2014 -0700

Remove merged Instantbird patches

* https://hg.mozilla.org/comm-central/rev/332650fa4e8d

* https://hg.mozilla.org/comm-central/rev/6b5ab77843f5 --- ...raw-msgs-through-the-conversation-service.patch | 33 ------------------ projects/instantbird/config | 2 -- projects/instantbird/null.patch | 36 -------------------- 3 files changed, 71 deletions(-)

diff --git a/projects/instantbird/Send-raw-msgs-through-the-conversation-service.patch b/projects/instantbird/Send-raw-msgs-through-the-conversation-service.patch deleted file mode 100644 index 5600781..0000000 --- a/projects/instantbird/Send-raw-msgs-through-the-conversation-service.patch +++ /dev/null @@ -1,33 +0,0 @@ -# HG changeset patch -# User Arlo Breault arlolra@gmail.com -# Date 1413057966 25200 -# Sat Oct 11 13:06:06 2014 -0700 -# Node ID 7647c0a6d75b97678d048d2a07f01f5e6b7d4346 -# Parent b8497b2decd436a972daa74b3e6707d8bed835ae -Send raw msgs through the conversation service - -diff --git a/chat/components/src/imCommands.js b/chat/components/src/imCommands.js ---- a/chat/components/src/imCommands.js -+++ b/chat/components/src/imCommands.js -@@ -29,17 +29,20 @@ CommandsService.prototype = { - }); - - this.registerCommand({ - name: "raw", - get helpString() _("rawHelpString"), - usageContext: Ci.imICommand.CMD_CONTEXT_ALL, - priority: Ci.imICommand.CMD_PRIORITY_DEFAULT, - run: function(aMsg, aConv) { -- aConv.sendMsg(aMsg); -+ let conv = Services.conversations.getUIConversation(aConv); -+ if (!conv) -+ return false; -+ conv.sendMsg(aMsg); - return true; - } - }); - - this.registerCommand({ - // Reference the command service so we can use the internal properties - // directly. - cmdSrv: this, diff --git a/projects/instantbird/config b/projects/instantbird/config index 02bedcf..58c4030 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -47,8 +47,6 @@ input_files: - filename: facebook.patch - 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-[% c("var/osname") %]' name: mozconfig diff --git a/projects/instantbird/null.patch b/projects/instantbird/null.patch deleted file mode 100644 index 868f440..0000000 --- a/projects/instantbird/null.patch +++ /dev/null @@ -1,36 +0,0 @@ -# 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,