commit c4d518fde3e2c50db3de0d863d3672b95f84c820 Author: Arlo Breault <arlolra@gmail.com> Date: Sat Nov 5 14:59:57 2016 -0700 Trac 16489: Only show "close" button on Windows --- ChangeLog | 1 + .../0001-Set-Tor-Messenger-preferences.patch | 2 +- ...0002-Trac-16489-Prevent-account-autologin.patch | 2 +- ...Support-Special-Characters-input-prompt-o.patch | 2 +- ...Better-error-reporting-for-failed-outgoin.patch | 2 +- .../0005-Trac-13312-OTR-over-Twitter-DMs.patch | 2 +- ...-Fix-tab-strip-background-colour-on-OS-X..patch | 2 +- ...-XMPP-createConversation-should-handle-in.patch | 2 +- ...-Set-_userVCard-own-property-when-downloa.patch | 2 +- .../0009-XMPP-in-band-registration.patch | 2 +- .../instantbird/0010-Remove-search-from-UI.patch | 2 +- .../0011-Add-Tor-Messenger-branding.patch | 2 +- projects/instantbird/0012-Account-picture.patch | 2 +- .../0013-Modify-protocol-defaults.patch | 2 +- .../instantbird/0014-Modify-IRC-defaults.patch | 2 +- projects/instantbird/0015-Modify-themes.patch | 2 +- .../instantbird/0016-Modify-XMPP-defaults.patch | 2 +- projects/instantbird/0017-Remove-logging-UI.patch | 2 +- projects/instantbird/0018-Cert-override.patch | 2 +- .../0019-Display-all-traffic-over-Tor.patch | 2 +- .../instantbird/0020-Trac-17480-Content-sink.patch | 2 +- .../0021-SASL-ECDSA-NIST256P-CHALLENGE.patch | 2 +- ...-msg-is-not-defined-error-in-irc.js-chang.patch | 2 +- ...Contact-list-entries-should-adapt-their-h.patch | 2 +- ...1187281-Only-show-close-button-on-Windows.patch | 25 ++++++++++++++++++++++ projects/instantbird/config | 1 + 26 files changed, 50 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3257cf8..a59d7df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ Tor Messenger 0.3.0b1 -- * Use the tor-browser-45.4.0esr-6.0-1 branch (41f1c54a) on tor-browser * Use the THUNDERBIRD_45_4_0_RELEASE tag on comm-esr45 * Update ctypes-otr to 00e4e80a + * Trac 16489: Only show "close" button on Windows * Trac 16491: Contact list entries don't adapt to the actual font size * Trac 16536: Investigate Tor Browser patches relevant to Tor Messenger * Trac 17471: Investigate Tor Browser preferences relevant to Tor Messenger diff --git a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch index d485eec..55861c9 100644 --- a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch +++ b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch @@ -1,7 +1,7 @@ From b229ec3ed7af7f4e78b1d75a26c1ed76046ad3fe 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/23] Set Tor Messenger preferences +Subject: [PATCH 01/24] Set Tor Messenger preferences --- im/app/profile/all-instantbird.js | 399 ++++++++++++++++++++++++++++++++++++-- diff --git a/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch b/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch index 96a0b5a..0164642 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 facec2ac69b9068c63278572ffdfa432f259f373 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/23] Trac 16489: Prevent account autologin +Subject: [PATCH 02/24] Trac 16489: Prevent account autologin --- chat/components/src/imAccounts.js | 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 7702b9f..78751e2 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 e8cbcbe0aab97d75fec3abe65b575f3e814e7837 Mon Sep 17 00:00:00 2001 From: aleth <aleth@instantbird.org> Date: Sat, 30 Jan 2016 20:56:38 +0100 -Subject: [PATCH 03/23] Trac 17896: Support "Special Characters" input prompt +Subject: [PATCH 03/24] 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 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 9aa4468..9ead7ba 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 922480805c668eecb6edbbda2b2a4dfb61107144 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/23] Trac 17494: Better error reporting for failed outgoing +Subject: [PATCH 04/24] Trac 17494: Better error reporting for failed outgoing messages * Bug 1245325 - Better error reporting for failed outgoing messages. r=clokep 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 ba27e8c..a76c4c0 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 6990be2c6ac257be6f8aa284814489be2c6f25ea 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/23] Trac 13312: OTR over Twitter DMs +Subject: [PATCH 05/24] Trac 13312: OTR over Twitter DMs --- chat/components/src/imConversations.js | 4 +- 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 dce21df..ed73418 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 ef854ddec3ec3f62d612484d7099e461fe18d128 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/23] Bug 1218193 - Fix tab strip background colour on OS X. +Subject: [PATCH 06/24] Bug 1218193 - Fix tab strip background colour on OS X. r=aleth --- 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 2e7f702..965c3c8 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 a60538df8166c6eb8e267ac92598706c25ff35f8 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/23] Bug 1246431 - XMPP createConversation should handle +Subject: [PATCH 07/24] Bug 1246431 - XMPP createConversation should handle incoming messages from the server properly. r=aleth --- 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 fb53f3c..d33a7e5 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 2ed57a22907efdee880b30d956391d52417b01a6 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/23] Bug 1298574 - Set _userVCard own property when +Subject: [PATCH 08/24] Bug 1298574 - Set _userVCard own property when downloading vCard fails. r=aleth * This prevents an infinite req / res cycle. diff --git a/projects/instantbird/0009-XMPP-in-band-registration.patch b/projects/instantbird/0009-XMPP-in-band-registration.patch index cfa567c..be06a9a 100644 --- a/projects/instantbird/0009-XMPP-in-band-registration.patch +++ b/projects/instantbird/0009-XMPP-in-band-registration.patch @@ -1,7 +1,7 @@ From d28b2c39b8f9249490dc6499d831e6e6adbe838a 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/23] XMPP in-band registration +Subject: [PATCH 09/24] XMPP in-band registration --- chat/locales/en-US/xmpp.properties | 5 + diff --git a/projects/instantbird/0010-Remove-search-from-UI.patch b/projects/instantbird/0010-Remove-search-from-UI.patch index 26555bc..be853f8 100644 --- a/projects/instantbird/0010-Remove-search-from-UI.patch +++ b/projects/instantbird/0010-Remove-search-from-UI.patch @@ -1,7 +1,7 @@ From 33ec527a5ba77bbe3af57666c9a25b54d2d97512 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/23] Remove search from UI +Subject: [PATCH 10/24] Remove search from UI --- im/content/nsContextMenu.js | 18 +----------------- diff --git a/projects/instantbird/0011-Add-Tor-Messenger-branding.patch b/projects/instantbird/0011-Add-Tor-Messenger-branding.patch index 7245db5..3897cb6 100644 --- a/projects/instantbird/0011-Add-Tor-Messenger-branding.patch +++ b/projects/instantbird/0011-Add-Tor-Messenger-branding.patch @@ -1,7 +1,7 @@ From 41c60f97c6049e4e3bc130fa963616e9ddc77af6 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/23] Add Tor Messenger branding +Subject: [PATCH 11/24] Add Tor Messenger branding --- im/app/macbuild/Contents/Info.plist.in | 2 +- diff --git a/projects/instantbird/0012-Account-picture.patch b/projects/instantbird/0012-Account-picture.patch index 5e7abb8..96ab4fd 100644 --- a/projects/instantbird/0012-Account-picture.patch +++ b/projects/instantbird/0012-Account-picture.patch @@ -1,7 +1,7 @@ From 65de52be6fbf68084231270ec14c84f225ed0fed 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/23] Account picture +Subject: [PATCH 12/24] Account picture --- im/content/blist.xul | 3 +-- diff --git a/projects/instantbird/0013-Modify-protocol-defaults.patch b/projects/instantbird/0013-Modify-protocol-defaults.patch index 3e5cd3a..aa9d4fe 100644 --- a/projects/instantbird/0013-Modify-protocol-defaults.patch +++ b/projects/instantbird/0013-Modify-protocol-defaults.patch @@ -1,7 +1,7 @@ From 8dd9a15845160e182b8ca44e6f4d07fdd59ffed0 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/23] Modify protocol defaults +Subject: [PATCH 13/24] Modify protocol defaults * Top protocols diff --git a/projects/instantbird/0014-Modify-IRC-defaults.patch b/projects/instantbird/0014-Modify-IRC-defaults.patch index 83667ef..1962753 100644 --- a/projects/instantbird/0014-Modify-IRC-defaults.patch +++ b/projects/instantbird/0014-Modify-IRC-defaults.patch @@ -1,7 +1,7 @@ From ac449194473c8d254672c653b73f66350e665cc8 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/23] Modify IRC defaults +Subject: [PATCH 14/24] Modify IRC defaults * ctcp ping diff --git a/projects/instantbird/0015-Modify-themes.patch b/projects/instantbird/0015-Modify-themes.patch index 47a8d62..bf52e2a 100644 --- a/projects/instantbird/0015-Modify-themes.patch +++ b/projects/instantbird/0015-Modify-themes.patch @@ -1,7 +1,7 @@ From 38fbe7232753738d91ce12c4df53fe83a3192e16 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/23] Modify themes +Subject: [PATCH 15/24] Modify themes * theme extension updateh diff --git a/projects/instantbird/0016-Modify-XMPP-defaults.patch b/projects/instantbird/0016-Modify-XMPP-defaults.patch index 42e07c6..609a00d 100644 --- a/projects/instantbird/0016-Modify-XMPP-defaults.patch +++ b/projects/instantbird/0016-Modify-XMPP-defaults.patch @@ -1,7 +1,7 @@ From 64746206241b088e2a609662fcbe0edc3baad88b 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/23] Modify XMPP defaults +Subject: [PATCH 16/24] Modify XMPP defaults * xmpp-default-domain diff --git a/projects/instantbird/0017-Remove-logging-UI.patch b/projects/instantbird/0017-Remove-logging-UI.patch index 83c6c6c..e651833 100644 --- a/projects/instantbird/0017-Remove-logging-UI.patch +++ b/projects/instantbird/0017-Remove-logging-UI.patch @@ -1,7 +1,7 @@ From 47bb9db3798b59d066399ec289295229a1aa4168 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/23] Remove logging UI +Subject: [PATCH 17/24] Remove logging UI --- im/content/preferences/privacy.xul | 20 -------------------- diff --git a/projects/instantbird/0018-Cert-override.patch b/projects/instantbird/0018-Cert-override.patch index f7c0f5a..2868e33 100644 --- a/projects/instantbird/0018-Cert-override.patch +++ b/projects/instantbird/0018-Cert-override.patch @@ -1,7 +1,7 @@ From 9ded93b407e23a54bd335d273d31496bc426ffd1 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/23] Cert override +Subject: [PATCH 18/24] Cert override --- im/app/profile/cert_override.txt | 3 +++ diff --git a/projects/instantbird/0019-Display-all-traffic-over-Tor.patch b/projects/instantbird/0019-Display-all-traffic-over-Tor.patch index c8d5779..6bc0776 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 119c059b638fcb772c4e9aa952d9899d58d93264 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/23] Display all traffic over Tor +Subject: [PATCH 19/24] Display all traffic over Tor --- im/content/accountWizard.xul | 2 ++ diff --git a/projects/instantbird/0020-Trac-17480-Content-sink.patch b/projects/instantbird/0020-Trac-17480-Content-sink.patch index 47c8e37..7c7d911 100644 --- a/projects/instantbird/0020-Trac-17480-Content-sink.patch +++ b/projects/instantbird/0020-Trac-17480-Content-sink.patch @@ -1,7 +1,7 @@ From 7512783d8cbcd15c9b0c2bfd07fbf4c2ff628f6e 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/23] Trac 17480: Content sink +Subject: [PATCH 20/24] Trac 17480: Content sink --- chat/modules/imContentSink.jsm | 30 +++++------------------------- diff --git a/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch b/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch index 43d0546..5fd96c5 100644 --- a/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch +++ b/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch @@ -1,7 +1,7 @@ From d6b9d9b02c72f979a8a01eef2bd6c358dfc5394b 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/23] SASL ECDSA-NIST256P-CHALLENGE +Subject: [PATCH 21/24] SASL ECDSA-NIST256P-CHALLENGE --- chat/components/src/imAccounts.js | 1 + 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 index 7064a26..df7305a 100644 --- 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 @@ -1,7 +1,7 @@ From 6c0d0db66b8375dd63a1f7bfe1661c8956f6d6cb Mon Sep 17 00:00:00 2001 From: aleth <aleth@instantbird.org> Date: Wed, 26 Oct 2016 20:16:58 +0200 -Subject: [PATCH 22/23] Bug 1313137 - "msg is not defined" error in +Subject: [PATCH 22/24] Bug 1313137 - "msg is not defined" error in irc.js:changeBuddyNick. r=clokep --HG-- diff --git a/projects/instantbird/0023-Bug-954368-Contact-list-entries-should-adapt-their-h.patch b/projects/instantbird/0023-Bug-954368-Contact-list-entries-should-adapt-their-h.patch index c0ee26e..4131428 100644 --- a/projects/instantbird/0023-Bug-954368-Contact-list-entries-should-adapt-their-h.patch +++ b/projects/instantbird/0023-Bug-954368-Contact-list-entries-should-adapt-their-h.patch @@ -1,7 +1,7 @@ From b55560a8e94434e8320e428145f9d93ca494ce04 Mon Sep 17 00:00:00 2001 From: aleth <aleth@instantbird.org> Date: Thu, 12 May 2016 15:10:43 +0200 -Subject: [PATCH 23/23] Bug 954368 - Contact list entries should adapt their +Subject: [PATCH 23/24] Bug 954368 - Contact list entries should adapt their height to the actual font size. r=florian --HG-- diff --git a/projects/instantbird/0024-Bug-1187281-Only-show-close-button-on-Windows.patch b/projects/instantbird/0024-Bug-1187281-Only-show-close-button-on-Windows.patch new file mode 100644 index 0000000..db8d41b --- /dev/null +++ b/projects/instantbird/0024-Bug-1187281-Only-show-close-button-on-Windows.patch @@ -0,0 +1,25 @@ +From aae841a7013929d5ba53e379de0d8b9b947d3789 Mon Sep 17 00:00:00 2001 +From: Arlo Breault <arlolra@gmail.com> +Date: Sat, 5 Nov 2016 14:55:20 -0700 +Subject: [PATCH 24/24] Bug 1187281 - Only show "close" button on Windows + +--- + im/content/accounts.xul | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/im/content/accounts.xul b/im/content/accounts.xul +index f3f1c6b..d683562 100644 +--- a/im/content/accounts.xul ++++ b/im/content/accounts.xul +@@ -142,6 +142,8 @@ + <windowdragbox id="bottombuttons" align="center"> + <button id="newaccount" command="cmd_new"/> + <spacer flex="1"/> ++#ifdef XP_WIN + <button id="close" command="cmd_close"/> ++#endif + </windowdragbox> + </window> +-- +2.10.2 + diff --git a/projects/instantbird/config b/projects/instantbird/config index 9a95eae..eedc112 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -85,6 +85,7 @@ input_files: - filename: 0021-SASL-ECDSA-NIST256P-CHALLENGE.patch - filename: 0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch - filename: 0023-Bug-954368-Contact-list-entries-should-adapt-their-h.patch + - filename: 0024-Bug-1187281-Only-show-close-button-on-Windows.patch - filename: mozconfig-common - filename: 'mozconfig-[% c("var/osname") %]' name: mozconfig