commit b24c72c3ecdde17daccb0337f2a727deeb09eede Author: Arlo Breault arlolra@gmail.com Date: Mon Oct 31 17:11:25 2016 -0700
Add a patch for bugzilla 1313137
* Irc "msg is not defined" error --- ChangeLog | 1 + .../0001-Set-Tor-Messenger-preferences.patch | 4 +-- ...0002-Trac-16489-Prevent-account-autologin.patch | 4 +-- ...Support-Special-Characters-input-prompt-o.patch | 4 +-- ...Better-error-reporting-for-failed-outgoin.patch | 4 +-- .../0005-Trac-13312-OTR-over-Twitter-DMs.patch | 4 +-- ...-Fix-tab-strip-background-colour-on-OS-X..patch | 4 +-- ...-XMPP-createConversation-should-handle-in.patch | 4 +-- ...-Set-_userVCard-own-property-when-downloa.patch | 4 +-- .../0009-XMPP-in-band-registration.patch | 4 +-- .../instantbird/0010-Remove-search-from-UI.patch | 4 +-- .../0011-Add-Tor-Messenger-branding.patch | 4 +-- projects/instantbird/0012-Account-picture.patch | 4 +-- .../0013-Modify-protocol-defaults.patch | 4 +-- .../instantbird/0014-Modify-IRC-defaults.patch | 4 +-- projects/instantbird/0015-Modify-themes.patch | 4 +-- .../instantbird/0016-Modify-XMPP-defaults.patch | 4 +-- projects/instantbird/0017-Remove-logging-UI.patch | 4 +-- projects/instantbird/0018-Cert-override.patch | 4 +-- .../0019-Display-all-traffic-over-Tor.patch | 4 +-- .../instantbird/0020-Trac-17480-Content-sink.patch | 4 +-- .../0021-SASL-ECDSA-NIST256P-CHALLENGE.patch | 4 +-- ...-msg-is-not-defined-error-in-irc.js-chang.patch | 29 ++++++++++++++++++++++ projects/instantbird/config | 1 + 24 files changed, 73 insertions(+), 42 deletions(-)
diff --git a/ChangeLog b/ChangeLog index 54d8dcf..b529abd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ Tor Messenger 0.3.0b1 -- * Trac 17480: Make url linkification toggleable * Update ctypes-otr to 00e4e80a * Trac 20231: Remove incomplete translations + * Fix irc "msg is not defined" error (bugzilla 1313137) * Mac * Trac 20206: Avoid prompting to download font "Osaka" on macOS Sierra * Trac 20204: Windows don't drag on macOS Sierra diff --git a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch index cb2ac47..a99fa26 100644 --- a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch +++ b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch @@ -1,7 +1,7 @@ From bfa4576ff8e6291a0cd293e05ac48b2a91c6a3c1 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 19:48:41 -0700 -Subject: [PATCH 01/21] Set Tor Messenger preferences +Subject: [PATCH 01/22] Set Tor Messenger preferences
--- im/app/profile/all-instantbird.js | 110 +++++++++++++++++++++++++++++++------- @@ -197,5 +197,5 @@ index b7a3970..eb1423f 100644 +// Put conversations on hold so that OTR disconnect is not sent. See #20208. +pref("messenger.conversations.holdByDefault", true); -- -2.10.1 +2.10.2
diff --git a/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch b/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch index df7e4c5..84b7c3c 100644 --- a/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch +++ b/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch @@ -1,7 +1,7 @@ From 2f9785b7fb8fba1dae99f914a7500bac41d4a17b Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Mon, 16 Nov 2015 20:37:53 -0800 -Subject: [PATCH 02/21] Trac 16489: Prevent account autologin +Subject: [PATCH 02/22] Trac 16489: Prevent account autologin
--- chat/components/src/imAccounts.js | 2 +- @@ -117,5 +117,5 @@ index e5f7fb6..5e0024d 100644 <caption label="&accountsMgr.label;"/>
-- -2.10.1 +2.10.2
diff --git a/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch b/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch index c801890..2b32591 100644 --- a/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch +++ b/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch @@ -1,7 +1,7 @@ From fa84f77e4b3c3091aec5a479f862aa8cdb12de6a Mon Sep 17 00:00:00 2001 From: aleth aleth@instantbird.org Date: Sat, 30 Jan 2016 20:56:38 +0100 -Subject: [PATCH 03/21] Trac 17896: Support "Special Characters" input prompt +Subject: [PATCH 03/22] Trac 17896: Support "Special Characters" input prompt on OS X
* Bug 1151784 - Add Edit menu to the conversation window on OS X. r=nhnt11,florian @@ -74,5 +74,5 @@ index 30aeb1f..14fc9e8 100644 <keyset id="mainkeyset"/> <menubar id="blistMenubar"/> -- -2.10.1 +2.10.2
diff --git a/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch b/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch index 1623b06..cc8b392 100644 --- a/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch +++ b/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch @@ -1,7 +1,7 @@ From 7fcda7da8eee17eccae8e25a7a24f0b7127fc3af Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Tue, 2 Feb 2016 16:04:51 -0800 -Subject: [PATCH 04/21] Trac 17494: Better error reporting for failed outgoing +Subject: [PATCH 04/22] Trac 17494: Better error reporting for failed outgoing messages
* Bug 1245325 - Better error reporting for failed outgoing messages. r=clokep @@ -63,5 +63,5 @@ index 67cab77..0022be3 100644 else if (this._isMucParticipant && muc && !muc.left && error.condition == "item-not-found") { -- -2.10.1 +2.10.2
diff --git a/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch b/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch index d324dc8..8cf35b0 100644 --- a/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch +++ b/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch @@ -1,7 +1,7 @@ From 2a8dc4c8043aeae007b4e727c54137f4ae90f3dd Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Tue, 15 Mar 2016 17:40:42 -0700 -Subject: [PATCH 05/21] Trac 13312: OTR over Twitter DMs +Subject: [PATCH 05/22] Trac 13312: OTR over Twitter DMs
--- chat/components/src/imConversations.js | 4 +- @@ -1002,5 +1002,5 @@ index fac9c56..af5e4d5 100644 };
-- -2.10.1 +2.10.2
diff --git a/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch b/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch index d65aa4b..a87b731 100644 --- a/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch +++ b/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch @@ -1,7 +1,7 @@ From 10e196e6c4e26d74baacba3e2b0f367a062b0287 Mon Sep 17 00:00:00 2001 From: Nihanth Subramanya nhnt11@gmail.com Date: Sun, 9 Oct 2016 21:53:04 -0700 -Subject: [PATCH 06/21] Bug 1218193 - Fix tab strip background colour on OS X. +Subject: [PATCH 06/22] Bug 1218193 - Fix tab strip background colour on OS X. r=aleth
--- @@ -22,5 +22,5 @@ index 76c5094..2915450 100644 background-repeat: repeat-x; } -- -2.10.1 +2.10.2
diff --git a/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch b/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch index b58f6b8..ac16309 100644 --- a/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch +++ b/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch @@ -1,7 +1,7 @@ From ecee8301b2187ea25e582d15e3d02bec5d29078e Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Sun, 9 Oct 2016 21:57:07 -0700 -Subject: [PATCH 07/21] Bug 1246431 - XMPP createConversation should handle +Subject: [PATCH 07/22] Bug 1246431 - XMPP createConversation should handle incoming messages from the server properly. r=aleth
--- @@ -22,5 +22,5 @@ index 0022be3..4420a1d 100644 throw "Invalid JID"; } -- -2.10.1 +2.10.2
diff --git a/projects/instantbird/0008-Bug-1298574-Set-_userVCard-own-property-when-downloa.patch b/projects/instantbird/0008-Bug-1298574-Set-_userVCard-own-property-when-downloa.patch index 2a3790f..f336a84 100644 --- a/projects/instantbird/0008-Bug-1298574-Set-_userVCard-own-property-when-downloa.patch +++ b/projects/instantbird/0008-Bug-1298574-Set-_userVCard-own-property-when-downloa.patch @@ -1,7 +1,7 @@ From 899378439d41d0ee36cba761edf43e4329cd9c07 Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Sun, 28 Aug 2016 08:57:41 -0700 -Subject: [PATCH 08/21] Bug 1298574 - Set _userVCard own property when +Subject: [PATCH 08/22] Bug 1298574 - Set _userVCard own property when downloading vCard fails. r=aleth
* This prevents an infinite req / res cycle. @@ -35,5 +35,5 @@ index 4420a1d..71f7770 100644 },
-- -2.10.1 +2.10.2
diff --git a/projects/instantbird/0009-XMPP-in-band-registration.patch b/projects/instantbird/0009-XMPP-in-band-registration.patch index 59f595c..41e9f90 100644 --- a/projects/instantbird/0009-XMPP-in-band-registration.patch +++ b/projects/instantbird/0009-XMPP-in-band-registration.patch @@ -1,7 +1,7 @@ From 1e0665d52f89f61af5dd07fc1d0c31dd90c0a483 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 18:42:25 -0700 -Subject: [PATCH 09/21] XMPP in-band registration +Subject: [PATCH 09/22] XMPP in-band registration
--- chat/locales/en-US/xmpp.properties | 5 + @@ -392,5 +392,5 @@ index 43d0f19..c46fb2f 100644 + +<!ENTITY registerXMPP.label "Create this new account on the server"> -- -2.10.1 +2.10.2
diff --git a/projects/instantbird/0010-Remove-search-from-UI.patch b/projects/instantbird/0010-Remove-search-from-UI.patch index d50e0d0..55f22ab 100644 --- a/projects/instantbird/0010-Remove-search-from-UI.patch +++ b/projects/instantbird/0010-Remove-search-from-UI.patch @@ -1,7 +1,7 @@ From a9aa4108eceba8f5d4472b27ba7f0f3223d535bc Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 18:47:48 -0700 -Subject: [PATCH 10/21] Remove search from UI +Subject: [PATCH 10/22] Remove search from UI
--- im/content/nsContextMenu.js | 18 +----------------- @@ -60,5 +60,5 @@ index fad67c1..cfe2405 100644 <groupbox> <caption label="&configEditDesc.label;"/> -- -2.10.1 +2.10.2
diff --git a/projects/instantbird/0011-Add-Tor-Messenger-branding.patch b/projects/instantbird/0011-Add-Tor-Messenger-branding.patch index 5d4b615..9b2d571 100644 --- a/projects/instantbird/0011-Add-Tor-Messenger-branding.patch +++ b/projects/instantbird/0011-Add-Tor-Messenger-branding.patch @@ -1,7 +1,7 @@ From ce1cba5c29e974399693c6b3dbd02b372a8a6ab3 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 18:56:27 -0700 -Subject: [PATCH 11/21] Add Tor Messenger branding +Subject: [PATCH 11/22] Add Tor Messenger branding
--- im/app/macbuild/Contents/Info.plist.in | 2 +- @@ -5129,5 +5129,5 @@ index 15ec569..4a2d35d 100644 -Info=Instantbird is installing your updates and will start in a few moments… +Info=Tor Messenger is installing your updates and will start in a few moments… -- -2.10.1 +2.10.2
diff --git a/projects/instantbird/0012-Account-picture.patch b/projects/instantbird/0012-Account-picture.patch index 6529c84..6c48541 100644 --- a/projects/instantbird/0012-Account-picture.patch +++ b/projects/instantbird/0012-Account-picture.patch @@ -1,7 +1,7 @@ From a40ca36edcb6b2be8ed958e39479998a8fe4fbc3 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 19:24:09 -0700 -Subject: [PATCH 12/21] Account picture +Subject: [PATCH 12/22] Account picture
--- im/content/blist.xul | 3 +-- @@ -22,5 +22,5 @@ index b90fdda..f29a48b 100644 <panel id="changeUserIconPanel" type="arrow" align="center" -- -2.10.1 +2.10.2
diff --git a/projects/instantbird/0013-Modify-protocol-defaults.patch b/projects/instantbird/0013-Modify-protocol-defaults.patch index 7a51c3a..cc51976 100644 --- a/projects/instantbird/0013-Modify-protocol-defaults.patch +++ b/projects/instantbird/0013-Modify-protocol-defaults.patch @@ -1,7 +1,7 @@ From 82b8069f3b5eef5d6ed8a87e8b122e2b0eae3a76 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 19:25:34 -0700 -Subject: [PATCH 13/21] Modify protocol defaults +Subject: [PATCH 13/22] Modify protocol defaults
* Top protocols
@@ -44,5 +44,5 @@ index d552a23..7d371bd 100644 topProtocol.prpl-twitter.description=Stay up to date with your Twitter timeline topProtocol.prpl-aim.description=Chat with your buddies on AOL Instant Messenger -- -2.10.1 +2.10.2
diff --git a/projects/instantbird/0014-Modify-IRC-defaults.patch b/projects/instantbird/0014-Modify-IRC-defaults.patch index a85bdc7..6d43240 100644 --- a/projects/instantbird/0014-Modify-IRC-defaults.patch +++ b/projects/instantbird/0014-Modify-IRC-defaults.patch @@ -1,7 +1,7 @@ From 14b1768d06adce5dd85dd56ea4c89984d420c36e Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 19:31:58 -0700 -Subject: [PATCH 14/21] Modify IRC defaults +Subject: [PATCH 14/22] Modify IRC defaults
* ctcp ping
@@ -61,5 +61,5 @@ index 28eb374..120be10 100644 ". Sending TIME response: "" + now + ""."); this.sendCTCPMessage(aMessage.origin, true, "TIME", ":" + now); -- -2.10.1 +2.10.2
diff --git a/projects/instantbird/0015-Modify-themes.patch b/projects/instantbird/0015-Modify-themes.patch index 6747420..ef7197c 100644 --- a/projects/instantbird/0015-Modify-themes.patch +++ b/projects/instantbird/0015-Modify-themes.patch @@ -1,7 +1,7 @@ From 8f6fad682f3fc785e324faf086e5248b54e50f2e Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 19:36:38 -0700 -Subject: [PATCH 15/21] Modify themes +Subject: [PATCH 15/22] Modify themes
* theme extension updateh
@@ -74,5 +74,5 @@ index 454e366..18ba1f9 100644 <separator class="thin"/> <description>&emoticonsPreview.description;</description> -- -2.10.1 +2.10.2
diff --git a/projects/instantbird/0016-Modify-XMPP-defaults.patch b/projects/instantbird/0016-Modify-XMPP-defaults.patch index c31d92d..202cfb1 100644 --- a/projects/instantbird/0016-Modify-XMPP-defaults.patch +++ b/projects/instantbird/0016-Modify-XMPP-defaults.patch @@ -1,7 +1,7 @@ From 7002186f102f329431ad1f1afce87af75f7a4570 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 19:38:49 -0700 -Subject: [PATCH 16/21] Modify XMPP defaults +Subject: [PATCH 16/22] Modify XMPP defaults
* xmpp-default-domain
@@ -44,5 +44,5 @@ index 265445a..a5635ca 100644 connection_security: { get label() { return _("options.connectionSecurity"); }, -- -2.10.1 +2.10.2
diff --git a/projects/instantbird/0017-Remove-logging-UI.patch b/projects/instantbird/0017-Remove-logging-UI.patch index f6cc574..4ac4152 100644 --- a/projects/instantbird/0017-Remove-logging-UI.patch +++ b/projects/instantbird/0017-Remove-logging-UI.patch @@ -1,7 +1,7 @@ From af2bff6a7f15123c567b4c911b5842423fee0514 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 19:50:48 -0700 -Subject: [PATCH 17/21] Remove logging UI +Subject: [PATCH 17/22] Remove logging UI
--- im/content/preferences/privacy.xul | 20 -------------------- @@ -39,5 +39,5 @@ index 7c9db1c..2d7b270 100644 <groupbox id="passwordsGroup" orient="vertical"> <caption label="&passwords.label;"/> -- -2.10.1 +2.10.2
diff --git a/projects/instantbird/0018-Cert-override.patch b/projects/instantbird/0018-Cert-override.patch index 2ffbb29..bea2ec5 100644 --- a/projects/instantbird/0018-Cert-override.patch +++ b/projects/instantbird/0018-Cert-override.patch @@ -1,7 +1,7 @@ From da09cc5555865e5f86a4627d9ad1fd9de4dd392b Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 19:56:46 -0700 -Subject: [PATCH 18/21] Cert override +Subject: [PATCH 18/22] Cert override
--- im/app/profile/cert_override.txt | 3 +++ @@ -60,5 +60,5 @@ index 1174b3d..3e35a2e 100644 #ifdef XP_MACOSX @RESPATH@/components/ibDockBadge.js -- -2.10.1 +2.10.2
diff --git a/projects/instantbird/0019-Display-all-traffic-over-Tor.patch b/projects/instantbird/0019-Display-all-traffic-over-Tor.patch index 8d08a6d..d1ffe21 100644 --- a/projects/instantbird/0019-Display-all-traffic-over-Tor.patch +++ b/projects/instantbird/0019-Display-all-traffic-over-Tor.patch @@ -1,7 +1,7 @@ From b4e33411b5743601307009ce6e31235fccb57ba3 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 19:58:31 -0700 -Subject: [PATCH 19/21] Display all traffic over Tor +Subject: [PATCH 19/22] Display all traffic over Tor
--- im/content/accountWizard.xul | 2 ++ @@ -34,5 +34,5 @@ index c46fb2f..6b49c84 100644 <!ENTITY accountProtocolShowMore.label "Show all protocols"> <!ENTITY accountProtocolShowMore.description "Choose from the full list of protocols"> -- -2.10.1 +2.10.2
diff --git a/projects/instantbird/0020-Trac-17480-Content-sink.patch b/projects/instantbird/0020-Trac-17480-Content-sink.patch index 619ce7d..29aeaf4 100644 --- a/projects/instantbird/0020-Trac-17480-Content-sink.patch +++ b/projects/instantbird/0020-Trac-17480-Content-sink.patch @@ -1,7 +1,7 @@ From 2194d4caace6d18b2a33a57df3618019b9bc77d8 Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Wed, 5 Oct 2016 11:09:25 -0700 -Subject: [PATCH 20/21] Trac 17480: Content sink +Subject: [PATCH 20/22] Trac 17480: Content sink
--- chat/modules/imContentSink.jsm | 30 +++++------------------------- @@ -97,5 +97,5 @@ index 3b8ccfa..ba41da7 100644 <menuitem value="0" label="&filterLevelNone;"/> </menupopup> -- -2.10.1 +2.10.2
diff --git a/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch b/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch index f50551b..7d0df64 100644 --- a/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch +++ b/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch @@ -1,7 +1,7 @@ From afec16433c83df4452b6b362032cd624f7f5541d Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Sun, 2 Oct 2016 08:46:55 -0700 -Subject: [PATCH 21/21] SASL ECDSA-NIST256P-CHALLENGE +Subject: [PATCH 21/22] SASL ECDSA-NIST256P-CHALLENGE
--- chat/components/src/imAccounts.js | 1 + @@ -8915,5 +8915,5 @@ index bc25396..e46815d 100644 'ircCAP.jsm', 'ircCommands.jsm', -- -2.10.1 +2.10.2
diff --git a/projects/instantbird/0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch b/projects/instantbird/0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch new file mode 100644 index 0000000..f80c5e2 --- /dev/null +++ b/projects/instantbird/0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch @@ -0,0 +1,29 @@ +From 6f07adf6e3db9f65cf4c45ecaba8f1f12423acff Mon Sep 17 00:00:00 2001 +From: aleth aleth@instantbird.org +Date: Wed, 26 Oct 2016 20:16:58 +0200 +Subject: [PATCH 22/22] Bug 1313137 - "msg is not defined" error in + irc.js:changeBuddyNick. r=clokep + +--HG-- +extra : rebase_source : 5752a69059ecd48b947809ef12de177ccab8528f +--- + chat/protocols/irc/irc.js | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/chat/protocols/irc/irc.js b/chat/protocols/irc/irc.js +index c2167a5..b58c2c2 100644 +--- a/chat/protocols/irc/irc.js ++++ b/chat/protocols/irc/irc.js +@@ -1289,7 +1289,8 @@ ircAccount.prototype = { + this.conversations.set(aNewNick, conversation); + + conversation.updateNick(aNewNick); +- conversation.writeMessage(aOldNick, msg, {system: true}); ++ conversation.writeMessage(aOldNick, _conv("nickSet", aOldNick, aNewNick), ++ {system: true}); + } + }, + +-- +2.10.2 + diff --git a/projects/instantbird/config b/projects/instantbird/config index 906788a..47014bc 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -79,6 +79,7 @@ input_files: - filename: 0019-Display-all-traffic-over-Tor.patch - filename: 0020-Trac-17480-Content-sink.patch - filename: 0021-SASL-ECDSA-NIST256P-CHALLENGE.patch + - filename: 0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch - filename: 'mozconfig-[% c("var/osname") %]' name: mozconfig - name: mozilla