[tor-commits] [tor-messenger-build/master] Remove patch

[arlo@xxxxxxxxxxxxxx]

commit 38e4460835ede60ed4b9a499e50fca5ea9756db7
Author: Arlo Breault <arlolra@xxxxxxxxx>
Date:   Tue Mar 3 20:34:54 2015 -0800

    Remove patch
    
     * Fixed by https://github.com/arlolra/ctypes-otr/commit/1215828b26507aad3025e5c771b14a745769f482
---
 projects/instantbird/slashme.patch |   44 ------------------------------------
 1 file changed, 44 deletions(-)

diff --git a/projects/instantbird/slashme.patch b/projects/instantbird/slashme.patch
deleted file mode 100644
index f979fff..0000000
--- a/projects/instantbird/slashme.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-# HG changeset patch
-# User Arlo Breault <arlolra@xxxxxxxxx>
-# Date 1415252765 28800
-#      Wed Nov 05 21:46:05 2014 -0800
-# Node ID 17ce33f549af16468fc96d2eb5292a148505479e
-# Parent  49fc79e39b9c292d182a46aa800135bd65b6c38f
-Slash me hack
-
- * Temporarily work around this leak until a cleaner solution is found.
-
-diff --git a/chat/protocols/irc/ircCommands.jsm b/chat/protocols/irc/ircCommands.jsm
---- a/chat/protocols/irc/ircCommands.jsm
-+++ b/chat/protocols/irc/ircCommands.jsm
-@@ -72,26 +72,20 @@ function setMode(aNickname, aConv, aMode
-                   [aConv.name, (aAdd ? "+" : "-") + aMode, aNick]));
- }
- 
- function actionCommand(aMsg, aConv) {
-   // Don't try to send an empty action.
-   if (!aMsg || !aMsg.trim().length)
-     return false;
- 
--  let conv = getConv(aConv);
--  let account = getAccount(aConv);
--  if (!ctcpCommand(aConv, aConv.name, "ACTION", aMsg)) {
--    conv.writeMessage(account._currentServerName, _("error.sendMessageFailed"),
--                      {error: true, system: true});
--    return true;
--  }
--
--  // Show the action on our conversation.
--  conv.writeMessage(account._nickname, "/me " + aMsg, {outgoing: true});
-+  let conv = Services.conversations.getUIConversation(aConv);
-+  if (!conv)
-+    return false;
-+  conv.sendMsg("/me " + aMsg);
-   return true;
- }
- 
- // This will open the conversation, and send and display the text.
- // aReturnedConv is optional and returns the resulting conversation.
- function privateMessage(aConv, aMsg, aNickname, aReturnedConv) {
-   if (!aMsg.length)
-     return false;

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits