commit 4bf82e39c706b680ede94f0c894c4352a6080a25 Author: Arlo Breault <arlolra@gmail.com> Date: Thu Dec 1 11:09:04 2016 -0800 Don't allow javascript: links in themes --- ChangeLog | 1 + .../0001-Set-Tor-Messenger-preferences.patch | 43 +++++++++++--------- ...0002-Trac-16489-Prevent-account-autologin.patch | 14 +++---- ...Support-Special-Characters-input-prompt-o.patch | 10 ++--- ...Better-error-reporting-for-failed-outgoin.patch | 8 ++-- .../0005-Trac-13312-OTR-over-Twitter-DMs.patch | 10 ++--- ...-Fix-tab-strip-background-colour-on-OS-X..patch | 6 +-- ...-XMPP-createConversation-should-handle-in.patch | 6 +-- ...-Set-_userVCard-own-property-when-downloa.patch | 6 +-- .../0009-XMPP-in-band-registration.patch | 20 +++++----- .../instantbird/0010-Remove-search-from-UI.patch | 8 ++-- .../0011-Add-Tor-Messenger-branding.patch | 46 +++++++++++----------- projects/instantbird/0012-Account-picture.patch | 6 +-- .../0013-Modify-protocol-defaults.patch | 8 ++-- .../instantbird/0014-Modify-IRC-defaults.patch | 8 ++-- projects/instantbird/0015-Modify-themes.patch | 10 ++--- .../instantbird/0016-Modify-XMPP-defaults.patch | 8 ++-- projects/instantbird/0017-Remove-logging-UI.patch | 6 +-- projects/instantbird/0018-Cert-override.patch | 12 +++--- .../0019-Display-all-traffic-over-Tor.patch | 8 ++-- .../instantbird/0020-Trac-17480-Content-sink.patch | 8 ++-- .../0021-SASL-ECDSA-NIST256P-CHALLENGE.patch | 12 +++--- ...-msg-is-not-defined-error-in-irc.js-chang.patch | 6 +-- ...Contact-list-entries-should-adapt-their-h.patch | 20 +++++----- ...1187281-Only-show-close-button-on-Windows.patch | 6 +-- ...-Remove-old-Yahoo-Messenger-support.-r-al.patch | 34 ++++++++-------- 26 files changed, 168 insertions(+), 162 deletions(-) diff --git a/ChangeLog b/ChangeLog index c661505..3e3f64e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ Tor Messenger 0.3.0b2 -- * Use the tor-browser-45.5.1esr-6.0-1-build1 tag on tor-browser * Use the THUNDERBIRD_45_5_1_RELEASE tag on comm-esr45 * Update tor-browser to 6.0.7 + * Don't allow javascript: links in themes Tor Messenger 0.3.0b1 -- November 22, 2016 * All Platforms diff --git a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch index 63f721b..2a75c3b 100644 --- a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch +++ b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch @@ -1,24 +1,24 @@ -From e1433d0d96a99a6382b70fffa60158b8b5efeefa Mon Sep 17 00:00:00 2001 +From 0df511dda30a868bc85824931ea0c4c56b1fbf03 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/25] Set Tor Messenger preferences --- - im/app/profile/all-instantbird.js | 403 ++++++++++++++++++++++++++++++++++++-- - 1 file changed, 382 insertions(+), 21 deletions(-) + im/app/profile/all-instantbird.js | 406 +++++++++++++++++++++++++++++++++++--- + 1 file changed, 384 insertions(+), 22 deletions(-) diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird.js -index b7a3970..ce25d3a 100644 +index b7a397017..6fc2c90a7 100644 --- a/im/app/profile/all-instantbird.js +++ b/im/app/profile/all-instantbird.js -@@ -1,3 +1,46 @@ +@@ -1,3 +1,47 @@ +/** + * This file is divded into three section, + * + * 1) Tor Messenger prefs, not found in the next two sections; + * 2) The original Instantbird prefs found here, modified by TM; -+ * 3) Tor Browser's 000-tor-browser.js, modified by TM or commented out when -+ * duplicating a previously declared pref. ++ * 3) Tor Browser's browser/app/profile/000-tor-browser.js, modified by TM ++ * or commented out when duplicating a previously declared pref. + * + * The idea being that to update this file when rebasing, we'd just paste the + * full contents of those files over the corresponding sections and then look @@ -26,6 +26,7 @@ index b7a3970..ce25d3a 100644 + */ + + ++// NOTE: These are mostly found in chat/chat-prefs.js + +// Disable all logging +pref("purple.logging.log_chats", false); @@ -58,7 +59,7 @@ index b7a3970..ce25d3a 100644 /* 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/. */ -@@ -28,7 +71,7 @@ pref("general.autoScroll", true); +@@ -28,7 +72,7 @@ pref("general.autoScroll", true); // 0 = spellcheck nothing // 1 = check multi-line controls [default] // 2 = check multi/single line controls @@ -67,7 +68,7 @@ index b7a3970..ce25d3a 100644 pref("messenger.accounts.convertOldPasswords", true); pref("messenger.accounts.promptOnDelete", true); -@@ -66,7 +109,7 @@ pref("extensions.mintrayr.singleClickRestore", false); +@@ -66,7 +110,7 @@ pref("extensions.mintrayr.singleClickRestore", false); // Whether message related sounds should be played at all. If this is enabled // then the more specific prefs are checked as well. @@ -76,7 +77,7 @@ index b7a3970..ce25d3a 100644 // Specifies whether each message event should trigger a sound for incoming // and outgoing messages, or when your nickname is mentioned in a chat. pref("messenger.options.playSounds.outgoing", true); -@@ -142,26 +185,23 @@ pref("app.update.staging.enabled", true); +@@ -142,26 +186,23 @@ pref("app.update.staging.enabled", true); // Update service URL: // You do not need to use all the %VAR% parameters. Use what you need, %PRODUCT%,%VERSION%,%BUILD_ID%,%CHANNEL% for example @@ -108,7 +109,7 @@ index b7a3970..ce25d3a 100644 // Interval: Time before prompting the user to restart to install the latest // download (in seconds) default=30 minutes -@@ -202,7 +242,7 @@ pref("browser.search.order.1", "chrome://instantbird/locale/regio +@@ -202,7 +243,7 @@ pref("browser.search.order.1", "chrome://instantbird/locale/regio pref("browser.search.order.2", "chrome://instantbird/locale/region.properties"); // send ping to the server to update @@ -117,7 +118,7 @@ index b7a3970..ce25d3a 100644 // disable logging for the search service update system by default pref("browser.search.update.log", false); -@@ -222,10 +262,10 @@ pref("extensions.ignoreMTimeChanges", false); +@@ -222,10 +263,10 @@ pref("extensions.ignoreMTimeChanges", false); pref("extensions.logging.enabled", false); pref("general.skins.selectedSkin", "classic/1.0"); @@ -130,7 +131,7 @@ index b7a3970..ce25d3a 100644 // Preferences for the Get Add-ons pane pref("extensions.getAddons.cache.enabled", false); -@@ -245,9 +285,9 @@ pref("extensions.getMoreEmoticonsURL", "https://add-ons.instantbird.org/%LOCALE% +@@ -245,9 +286,9 @@ pref("extensions.getMoreEmoticonsURL", "https://add-ons.instantbird.org/%LOCALE% pref("extensions.getMoreProtocolsURL", "https://add-ons.instantbird.org/%LOCALE%/%APP%/%VERSION%/protocols/"); // suppress external-load warning for standard browser schemes @@ -143,8 +144,12 @@ index b7a3970..ce25d3a 100644 // don't load links inside Instantbird pref("network.protocol-handler.expose-all", false); -@@ -262,10 +302,10 @@ pref("network.protocol-handler.expose.https", true); - pref("network.protocol-handler.expose.javascript", true); +@@ -259,13 +300,13 @@ pref("network.protocol-handler.expose.https", true); + + // expose javascript: so that message themes can use it. + // javascript: links inside messages are filtered out. +-pref("network.protocol-handler.expose.javascript", true); ++pref("network.protocol-handler.expose.javascript", false); // 0-Accept, 1-dontAcceptForeign, 2-dontUse -pref("network.cookie.cookieBehavior", 0); @@ -156,7 +161,7 @@ index b7a3970..ce25d3a 100644 // We have an Error Console menu item by default so let's display chrome errors pref("javascript.options.showInConsole", true); -@@ -300,14 +340,335 @@ pref("browser.tabs.tabClipWidth", 140); +@@ -300,14 +341,335 @@ pref("browser.tabs.tabClipWidth", 140); // 3 at the end of the tabstrip pref("browser.tabs.closeButtons", 1); @@ -448,7 +453,7 @@ index b7a3970..ce25d3a 100644 + +// Putting the search engine prefs into this file to fix #11236. +// Default search engine -+//pref("browser.search.defaultenginename", "Disconnect"); // TM ++//pref("browser.search.defaultenginename", "DuckDuckGo"); // TM +// Make sure we use the same search engine regardless of locale +pref("browser.search.geoSpecificDefaults", false); + @@ -456,7 +461,7 @@ index b7a3970..ce25d3a 100644 +// Somewhat surprisingly we get some random behavior if we specify more than +// two search engines as below. See +// https://bugzilla.mozilla.org/show_bug.cgi?id=1126722 for details. -+//pref("browser.search.order.extra.1", "Disconnect"); // TM ++//pref("browser.search.order.extra.1", "DuckDuckGo"); // TM +//pref("browser.search.order.extra.2", "YouTube"); // TM + +// Hacks/workarounds: Direct2D seems to crash w/ lots of video cards w/ MinGW? @@ -496,5 +501,5 @@ index b7a3970..ce25d3a 100644 +#expand pref("torbrowser.version", __TOR_BROWSER_VERSION__); +#endif -- -2.10.2 +2.11.0 diff --git a/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch b/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch index 4d05d86..f13e124 100644 --- a/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch +++ b/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch @@ -1,4 +1,4 @@ -From eccb4c61667e2887f335b780dcf3f1545d03cbb3 Mon Sep 17 00:00:00 2001 +From 11b8b6e1d0a75e22558353d6faf07c705e624054 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/25] Trac 16489: Prevent account autologin @@ -12,7 +12,7 @@ Subject: [PATCH 02/25] Trac 16489: Prevent account autologin 5 files changed, 2 insertions(+), 35 deletions(-) diff --git a/chat/components/src/imAccounts.js b/chat/components/src/imAccounts.js -index c13c610..5bfea57 100644 +index c13c6100d..5bfea57f2 100644 --- a/chat/components/src/imAccounts.js +++ b/chat/components/src/imAccounts.js @@ -588,7 +588,7 @@ imAccount.prototype = { @@ -25,7 +25,7 @@ index c13c610..5bfea57 100644 autoLogin = this.prefBranch.getBoolPref(kPrefAccountAutoLogin); } catch (e) { } diff --git a/im/content/account.xml b/im/content/account.xml -index e063318..78195b7 100644 +index e06331875..78195b71f 100644 --- a/im/content/account.xml +++ b/im/content/account.xml @@ -41,10 +41,6 @@ @@ -40,7 +40,7 @@ index e063318..78195b7 100644 <xul:hbox flex="1" class="account-buttons" anonid="buttons" xbl:inherits="autologin"/> diff --git a/im/content/accountWizard.js b/im/content/accountWizard.js -index 73707c9..ed3b8f0 100644 +index 73707c9e2..ed3b8f0f7 100644 --- a/im/content/accountWizard.js +++ b/im/content/accountWizard.js @@ -442,22 +442,13 @@ var accountWizard = { @@ -68,7 +68,7 @@ index 73707c9..ed3b8f0 100644 let am = window.opener.gAccountManager; if (am) diff --git a/im/content/accountWizard.xul b/im/content/accountWizard.xul -index 5fa5b82..9eb5352 100644 +index 5fa5b8293..9eb5352a6 100644 --- a/im/content/accountWizard.xul +++ b/im/content/accountWizard.xul @@ -137,8 +137,6 @@ @@ -81,7 +81,7 @@ index 5fa5b82..9eb5352 100644 </wizard> diff --git a/im/content/preferences/main.xul b/im/content/preferences/main.xul -index e5f7fb6..5e0024d 100644 +index e5f7fb659..5e0024d86 100644 --- a/im/content/preferences/main.xul +++ b/im/content/preferences/main.xul @@ -20,7 +20,6 @@ @@ -117,5 +117,5 @@ index e5f7fb6..5e0024d 100644 <caption label="&accountsMgr.label;"/> -- -2.10.2 +2.11.0 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 3b2cf27..ddb44bb 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,4 +1,4 @@ -From d433556773d91789bd05019c64a751a8afcdd763 Mon Sep 17 00:00:00 2001 +From 7086cb8f65f506ec27767f2a2d03295b3e77b817 Mon Sep 17 00:00:00 2001 From: aleth <aleth@instantbird.org> Date: Sat, 30 Jan 2016 20:56:38 +0100 Subject: [PATCH 03/25] Trac 17896: Support "Special Characters" input prompt @@ -14,7 +14,7 @@ Subject: [PATCH 03/25] Trac 17896: Support "Special Characters" input prompt 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/im/content/instantbird.xul b/im/content/instantbird.xul -index 15a3f98..d208921 100644 +index 15a3f988b..d20892198 100644 --- a/im/content/instantbird.xul +++ b/im/content/instantbird.xul @@ -48,7 +48,28 @@ @@ -48,7 +48,7 @@ index 15a3f98..d208921 100644 <commandset id="conversationsCommands"> diff --git a/im/content/menus.xul b/im/content/menus.xul -index 0889ce8..894ef13 100644 +index 0889ce87d..894ef13c4 100644 --- a/im/content/menus.xul +++ b/im/content/menus.xul @@ -43,7 +43,7 @@ @@ -61,7 +61,7 @@ index 0889ce8..894ef13 100644 <menuitem id="addBuddyMenuItem" label="&addContact;" command="cmd_addbuddy" key="addBuddykey" accesskey="&addContact.accesskey;"/> <menuitem id="newTabMenuItem" label="&newtab;" command="cmd_newtab" key="newtabkey" accesskey="&newtab.accesskey;"/> diff --git a/im/content/menus.xul.inc b/im/content/menus.xul.inc -index 30aeb1f..14fc9e8 100644 +index 30aeb1fc5..14fc9e8f6 100644 --- a/im/content/menus.xul.inc +++ b/im/content/menus.xul.inc @@ -2,6 +2,8 @@ @@ -74,5 +74,5 @@ index 30aeb1f..14fc9e8 100644 <keyset id="mainkeyset"/> <menubar id="blistMenubar"/> -- -2.10.2 +2.11.0 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 e8d0da9..9178fb3 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,4 +1,4 @@ -From 3d8ced7b6852eb7fbee140825e39345906768729 Mon Sep 17 00:00:00 2001 +From 00767571b5e29389a54897cbbf28efc3fe96f9ca 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/25] Trac 17494: Better error reporting for failed outgoing @@ -11,7 +11,7 @@ Subject: [PATCH 04/25] Trac 17494: Better error reporting for failed outgoing 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/chat/locales/en-US/xmpp.properties b/chat/locales/en-US/xmpp.properties -index 7f824e5..293ab01 100644 +index 7f824e534..293ab01d4 100644 --- a/chat/locales/en-US/xmpp.properties +++ b/chat/locales/en-US/xmpp.properties @@ -66,7 +66,10 @@ conversation.error.sendFailedAsNotInRoom=Message could not be sent to %1$S as yo @@ -35,7 +35,7 @@ index 7f824e5..293ab01 100644 # LOCALIZATION NOTE (tooltip.*): # These are the titles of lines of information that will appear in diff --git a/chat/protocols/xmpp/xmpp.jsm b/chat/protocols/xmpp/xmpp.jsm -index 67cab77..0022be3 100644 +index 67cab7743..0022be35f 100644 --- a/chat/protocols/xmpp/xmpp.jsm +++ b/chat/protocols/xmpp/xmpp.jsm @@ -679,11 +679,18 @@ var XMPPConversationPrototype = { @@ -63,5 +63,5 @@ index 67cab77..0022be3 100644 else if (this._isMucParticipant && muc && !muc.left && error.condition == "item-not-found") { -- -2.10.2 +2.11.0 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 bfb301c..c48bc6b 100644 --- a/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch +++ b/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch @@ -1,4 +1,4 @@ -From 5c5afcd859e98522928bd1bfcd70d665c5fb579c Mon Sep 17 00:00:00 2001 +From a9b62bbc374934c2910ce53fb0668659cec4e73b 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/25] Trac 13312: OTR over Twitter DMs @@ -10,7 +10,7 @@ Subject: [PATCH 05/25] Trac 13312: OTR over Twitter DMs 3 files changed, 289 insertions(+), 208 deletions(-) diff --git a/chat/components/src/imConversations.js b/chat/components/src/imConversations.js -index 6fc5d0d..2a53a2c 100644 +index 6fc5d0d24..2a53a2c86 100644 --- a/chat/components/src/imConversations.js +++ b/chat/components/src/imConversations.js @@ -414,7 +414,8 @@ UIConversation.prototype = { @@ -24,7 +24,7 @@ index 6fc5d0d..2a53a2c 100644 this._messages.push(aSubject); ++this._unreadMessageCount; diff --git a/chat/modules/imContentSink.jsm b/chat/modules/imContentSink.jsm -index ee067af..abd95fc 100644 +index ee067afdf..abd95fc71 100644 --- a/chat/modules/imContentSink.jsm +++ b/chat/modules/imContentSink.jsm @@ -47,6 +47,7 @@ var kAllowedMozClasses = @@ -66,7 +66,7 @@ index ee067af..abd95fc 100644 'font': { 'face': true, diff --git a/chat/protocols/twitter/twitter.js b/chat/protocols/twitter/twitter.js -index 59f60cc..4d8e04c 100644 +index 59f60cc22..4d8e04c02 100644 --- a/chat/protocols/twitter/twitter.js +++ b/chat/protocols/twitter/twitter.js @@ -36,8 +36,11 @@ ChatBuddy.prototype = { @@ -739,5 +739,5 @@ index 59f60cc..4d8e04c 100644 }; -- -2.10.2 +2.11.0 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 6350a49..26fcaa3 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,4 +1,4 @@ -From d9a7eb05a9c292f8e9be864e6d77da581c1371b2 Mon Sep 17 00:00:00 2001 +From 8e736ffd5f007847f305bda7dd44fca761e96a6f 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/25] Bug 1218193 - Fix tab strip background colour on OS X. @@ -9,7 +9,7 @@ Subject: [PATCH 06/25] Bug 1218193 - Fix tab strip background colour on OS X. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/im/themes/tabbrowser-pinstripe/tabbrowser.css b/im/themes/tabbrowser-pinstripe/tabbrowser.css -index 76c5094..2915450 100644 +index 76c5094e3..291545039 100644 --- a/im/themes/tabbrowser-pinstripe/tabbrowser.css +++ b/im/themes/tabbrowser-pinstripe/tabbrowser.css @@ -208,7 +208,7 @@ statusbarpanel#statusbar-display { @@ -22,5 +22,5 @@ index 76c5094..2915450 100644 background-repeat: repeat-x; } -- -2.10.2 +2.11.0 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 c18cca0..071f916 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,4 +1,4 @@ -From 21254cac1e256e3468bfec270ad5898b33066a8b Mon Sep 17 00:00:00 2001 +From f709123309faa68e9b243b63ac548048731db0fd 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/25] Bug 1246431 - XMPP createConversation should handle @@ -9,7 +9,7 @@ Subject: [PATCH 07/25] Bug 1246431 - XMPP createConversation should handle 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chat/protocols/xmpp/xmpp.jsm b/chat/protocols/xmpp/xmpp.jsm -index 0022be3..4420a1d 100644 +index 0022be35f..4420a1d17 100644 --- a/chat/protocols/xmpp/xmpp.jsm +++ b/chat/protocols/xmpp/xmpp.jsm @@ -2108,7 +2108,7 @@ var XMPPAccountPrototype = { @@ -22,5 +22,5 @@ index 0022be3..4420a1d 100644 throw "Invalid JID"; } -- -2.10.2 +2.11.0 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 29f4833..789cd5f 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,4 +1,4 @@ -From c5d6eb544b71fb444fdf3b9b36965ed9a48070e8 Mon Sep 17 00:00:00 2001 +From 9866b6d2ec361d987d6bdc48014427df7139ea6c 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/25] Bug 1298574 - Set _userVCard own property when @@ -10,7 +10,7 @@ Subject: [PATCH 08/25] Bug 1298574 - Set _userVCard own property when 1 file changed, 14 insertions(+) diff --git a/chat/protocols/xmpp/xmpp.jsm b/chat/protocols/xmpp/xmpp.jsm -index 4420a1d..71f7770 100644 +index 4420a1d17..71f777009 100644 --- a/chat/protocols/xmpp/xmpp.jsm +++ b/chat/protocols/xmpp/xmpp.jsm @@ -2243,6 +2243,20 @@ var XMPPAccountPrototype = { @@ -35,5 +35,5 @@ index 4420a1d..71f7770 100644 }, -- -2.10.2 +2.11.0 diff --git a/projects/instantbird/0009-XMPP-in-band-registration.patch b/projects/instantbird/0009-XMPP-in-band-registration.patch index d68aa7d..bea0077 100644 --- a/projects/instantbird/0009-XMPP-in-band-registration.patch +++ b/projects/instantbird/0009-XMPP-in-band-registration.patch @@ -1,4 +1,4 @@ -From ed0b86bfdda083aaf7ecd7cbcf824d3874c1e332 Mon Sep 17 00:00:00 2001 +From ddb8fa8041c1808676b277cbe405aeb970b466b6 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/25] XMPP in-band registration @@ -17,7 +17,7 @@ Subject: [PATCH 09/25] XMPP in-band registration create mode 100644 im/content/xmppRegister.xul diff --git a/chat/locales/en-US/xmpp.properties b/chat/locales/en-US/xmpp.properties -index 293ab01..237d20c 100644 +index 293ab01d4..237d20c92 100644 --- a/chat/locales/en-US/xmpp.properties +++ b/chat/locales/en-US/xmpp.properties @@ -13,6 +13,9 @@ connection.initializingEncryption=Initializing encryption @@ -40,7 +40,7 @@ index 293ab01..237d20c 100644 # LOCALIZATION NOTE (conversation.error.notDelivered): diff --git a/chat/protocols/xmpp/xmpp-session.jsm b/chat/protocols/xmpp/xmpp-session.jsm -index 24618ee..246ec2b 100644 +index 24618ee0c..246ec2b7c 100644 --- a/chat/protocols/xmpp/xmpp-session.jsm +++ b/chat/protocols/xmpp/xmpp-session.jsm @@ -11,6 +11,8 @@ Cu.import("resource:///modules/socket.jsm"); @@ -150,7 +150,7 @@ index 24618ee..246ec2b 100644 this.ERROR("Unexpected stanza " + aStanza.localName + ", expected 'features'"); this._networkError(_("connection.error.incorrectResponse")); diff --git a/im/content/accountWizard.js b/im/content/accountWizard.js -index ed3b8f0..7c26d0d 100644 +index ed3b8f0f7..7c26d0d6e 100644 --- a/im/content/accountWizard.js +++ b/im/content/accountWizard.js @@ -119,6 +119,12 @@ var accountWizard = { @@ -176,7 +176,7 @@ index ed3b8f0..7c26d0d 100644 let option = this.prefs[i]; let opt = option.opt; diff --git a/im/content/accountWizard.xul b/im/content/accountWizard.xul -index 9eb5352..759f42b 100644 +index 9eb5352a6..759f42b38 100644 --- a/im/content/accountWizard.xul +++ b/im/content/accountWizard.xul @@ -65,6 +65,7 @@ @@ -188,7 +188,7 @@ index 9eb5352..759f42b 100644 <wizardpage id="accountpassword" pageid="accountpassword" next="accountadvanced" diff --git a/im/content/jar.mn b/im/content/jar.mn -index 98d9a09..20ea9dc 100644 +index 98d9a09a9..20ea9dce7 100644 --- a/im/content/jar.mn +++ b/im/content/jar.mn @@ -61,6 +61,8 @@ instantbird.jar: @@ -202,7 +202,7 @@ index 98d9a09..20ea9dc 100644 content/instantbird/menus-mac.xul diff --git a/im/content/xmppRegister.js b/im/content/xmppRegister.js new file mode 100644 -index 0000000..52852f0 +index 000000000..52852f045 --- /dev/null +++ b/im/content/xmppRegister.js @@ -0,0 +1,142 @@ @@ -350,7 +350,7 @@ index 0000000..52852f0 +} diff --git a/im/content/xmppRegister.xul b/im/content/xmppRegister.xul new file mode 100644 -index 0000000..e2bd367 +index 000000000..e2bd36750 --- /dev/null +++ b/im/content/xmppRegister.xul @@ -0,0 +1,27 @@ @@ -382,7 +382,7 @@ index 0000000..e2bd367 + +</dialog> diff --git a/im/locales/en-US/chrome/instantbird/accountWizard.dtd b/im/locales/en-US/chrome/instantbird/accountWizard.dtd -index 43d0f19..c46fb2f 100644 +index 43d0f19e3..c46fb2f95 100644 --- a/im/locales/en-US/chrome/instantbird/accountWizard.dtd +++ b/im/locales/en-US/chrome/instantbird/accountWizard.dtd @@ -31,3 +31,5 @@ @@ -392,5 +392,5 @@ index 43d0f19..c46fb2f 100644 + +<!ENTITY registerXMPP.label "Create this new account on the server"> -- -2.10.2 +2.11.0 diff --git a/projects/instantbird/0010-Remove-search-from-UI.patch b/projects/instantbird/0010-Remove-search-from-UI.patch index 3a8208b..4fcde9a 100644 --- a/projects/instantbird/0010-Remove-search-from-UI.patch +++ b/projects/instantbird/0010-Remove-search-from-UI.patch @@ -1,4 +1,4 @@ -From bde276da0f20ebf4815a9b0b2a5c7152d067b019 Mon Sep 17 00:00:00 2001 +From b1c97ccedc4099704e06e3c1d676b7af7fe8dba0 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/25] Remove search from UI @@ -9,7 +9,7 @@ Subject: [PATCH 10/25] Remove search from UI 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/im/content/nsContextMenu.js b/im/content/nsContextMenu.js -index 5261b79..f667793 100644 +index 5261b793f..f667793be 100644 --- a/im/content/nsContextMenu.js +++ b/im/content/nsContextMenu.js @@ -468,23 +468,7 @@ nsContextMenu.prototype = { @@ -38,7 +38,7 @@ index 5261b79..f667793 100644 // Returns true if anything is selected. diff --git a/im/content/preferences/advanced.xul b/im/content/preferences/advanced.xul -index fad67c1..cfe2405 100644 +index fad67c190..cfe2405ea 100644 --- a/im/content/preferences/advanced.xul +++ b/im/content/preferences/advanced.xul @@ -143,17 +143,6 @@ @@ -60,5 +60,5 @@ index fad67c1..cfe2405 100644 <groupbox> <caption label="&configEditDesc.label;"/> -- -2.10.2 +2.11.0 diff --git a/projects/instantbird/0011-Add-Tor-Messenger-branding.patch b/projects/instantbird/0011-Add-Tor-Messenger-branding.patch index 537ae08..f5a2c1a 100644 --- a/projects/instantbird/0011-Add-Tor-Messenger-branding.patch +++ b/projects/instantbird/0011-Add-Tor-Messenger-branding.patch @@ -1,4 +1,4 @@ -From 506c39b4736f8c983aa47303d7b2487dbf7e57c9 Mon Sep 17 00:00:00 2001 +From 9465dccf0297c300caf410f0e31ae49acbdf6a61 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/25] Add Tor Messenger branding @@ -101,7 +101,7 @@ Subject: [PATCH 11/25] Add Tor Messenger branding create mode 100644 im/content/browserMountPoints.inc diff --git a/im/app/macbuild/Contents/Info.plist.in b/im/app/macbuild/Contents/Info.plist.in -index 615e4e6..ac61e61 100644 +index 615e4e6b8..ac61e6134 100644 --- a/im/app/macbuild/Contents/Info.plist.in +++ b/im/app/macbuild/Contents/Info.plist.in @@ -11,7 +11,7 @@ @@ -115,7 +115,7 @@ index 615e4e6..ac61e61 100644 <key>CFBundleName</key> diff --git a/im/branding/messenger/Makefile.in b/im/branding/messenger/Makefile.in new file mode 100644 -index 0000000..b430956 +index 000000000..b4309568e --- /dev/null +++ b/im/branding/messenger/Makefile.in @@ -0,0 +1,49 @@ @@ -183,7 +183,7 @@ HcmV?d00001 diff --git a/im/branding/messenger/branding.nsi b/im/branding/messenger/branding.nsi new file mode 100755 -index 0000000..4683827 +index 000000000..4683827fa --- /dev/null +++ b/im/branding/messenger/branding.nsi @@ -0,0 +1,13 @@ @@ -202,7 +202,7 @@ index 0000000..4683827 + diff --git a/im/branding/messenger/configure.sh b/im/branding/messenger/configure.sh new file mode 100644 -index 0000000..7e58051 +index 000000000..7e580518b --- /dev/null +++ b/im/branding/messenger/configure.sh @@ -0,0 +1,5 @@ @@ -1218,7 +1218,7 @@ HcmV?d00001 diff --git a/im/branding/messenger/content/aboutDialog.css b/im/branding/messenger/content/aboutDialog.css new file mode 100644 -index 0000000..9a3c04e +index 000000000..9a3c04eb3 --- /dev/null +++ b/im/branding/messenger/content/aboutDialog.css @@ -0,0 +1,48 @@ @@ -2197,7 +2197,7 @@ HcmV?d00001 diff --git a/im/branding/messenger/jar.mn b/im/branding/messenger/jar.mn new file mode 100644 -index 0000000..929e7c9 +index 000000000..929e7c998 --- /dev/null +++ b/im/branding/messenger/jar.mn @@ -0,0 +1,14 @@ @@ -2217,7 +2217,7 @@ index 0000000..929e7c9 + content/branding/about-wordmark.png (content/about-wordmark.png) diff --git a/im/branding/messenger/locales/en-US/brand.dtd b/im/branding/messenger/locales/en-US/brand.dtd new file mode 100644 -index 0000000..4dc69f2 +index 000000000..4dc69f244 --- /dev/null +++ b/im/branding/messenger/locales/en-US/brand.dtd @@ -0,0 +1,10 @@ @@ -2233,7 +2233,7 @@ index 0000000..4dc69f2 +<!ENTITY vendorShortName "Tor Project"> diff --git a/im/branding/messenger/locales/en-US/brand.properties b/im/branding/messenger/locales/en-US/brand.properties new file mode 100644 -index 0000000..c09000f +index 000000000..c09000fdb --- /dev/null +++ b/im/branding/messenger/locales/en-US/brand.properties @@ -0,0 +1,7 @@ @@ -2246,7 +2246,7 @@ index 0000000..c09000f +vendorShortName=Tor Project diff --git a/im/branding/messenger/locales/jar.mn b/im/branding/messenger/locales/jar.mn new file mode 100755 -index 0000000..4fb707f +index 000000000..4fb707f30 --- /dev/null +++ b/im/branding/messenger/locales/jar.mn @@ -0,0 +1,10 @@ @@ -2262,7 +2262,7 @@ index 0000000..4fb707f + locale/@AB_CD@/branding/brand.properties (%brand.properties) diff --git a/im/branding/messenger/locales/moz.build b/im/branding/messenger/locales/moz.build new file mode 100644 -index 0000000..e59008d +index 000000000..e59008d87 --- /dev/null +++ b/im/branding/messenger/locales/moz.build @@ -0,0 +1,8 @@ @@ -2276,7 +2276,7 @@ index 0000000..e59008d +DEFINES['MOZ_DISTRIBUTION_ID_UNQUOTED'] = CONFIG['MOZ_DISTRIBUTION_ID'] diff --git a/im/branding/messenger/moz.build b/im/branding/messenger/moz.build new file mode 100644 -index 0000000..bd8ad85 +index 000000000..bd8ad850b --- /dev/null +++ b/im/branding/messenger/moz.build @@ -0,0 +1,8 @@ @@ -2624,7 +2624,7 @@ HcmV?d00001 diff --git a/im/branding/messenger/mozicon16.xpm b/im/branding/messenger/mozicon16.xpm new file mode 100644 -index 0000000..3434739 +index 000000000..3434739f6 --- /dev/null +++ b/im/branding/messenger/mozicon16.xpm @@ -0,0 +1,193 @@ @@ -2823,7 +2823,7 @@ index 0000000..3434739 +}; diff --git a/im/branding/messenger/mozicon50.xpm b/im/branding/messenger/mozicon50.xpm new file mode 100644 -index 0000000..76e799c +index 000000000..76e799c60 --- /dev/null +++ b/im/branding/messenger/mozicon50.xpm @@ -0,0 +1,314 @@ @@ -3855,7 +3855,7 @@ HcmV?d00001 diff --git a/im/content/aboutDialog-appUpdater.js b/im/content/aboutDialog-appUpdater.js new file mode 100644 -index 0000000..f223f06 +index 000000000..f223f061e --- /dev/null +++ b/im/content/aboutDialog-appUpdater.js @@ -0,0 +1,576 @@ @@ -4436,7 +4436,7 @@ index 0000000..f223f06 + } +}; diff --git a/im/content/aboutDialog.css b/im/content/aboutDialog.css -index 2507060..a065c8e 100644 +index 25070608b..a065c8e88 100644 --- a/im/content/aboutDialog.css +++ b/im/content/aboutDialog.css @@ -1,66 +1,91 @@ @@ -4573,7 +4573,7 @@ index 2507060..a065c8e 100644 +} diff --git a/im/content/aboutDialog.js b/im/content/aboutDialog.js new file mode 100644 -index 0000000..e265f23 +index 000000000..e265f239c --- /dev/null +++ b/im/content/aboutDialog.js @@ -0,0 +1,80 @@ @@ -4658,7 +4658,7 @@ index 0000000..e265f23 + } +} diff --git a/im/content/aboutDialog.xul b/im/content/aboutDialog.xul -index aa3b80e..ba924b9 100644 +index aa3b80ec9..ba924b9ad 100644 --- a/im/content/aboutDialog.xul +++ b/im/content/aboutDialog.xul @@ -1,130 +1,173 @@ @@ -4944,7 +4944,7 @@ index aa3b80e..ba924b9 100644 +</window> diff --git a/im/content/browserMountPoints.inc b/im/content/browserMountPoints.inc new file mode 100644 -index 0000000..e4315b0 +index 000000000..e4315b04a --- /dev/null +++ b/im/content/browserMountPoints.inc @@ -0,0 +1,12 @@ @@ -4962,7 +4962,7 @@ index 0000000..e4315b0 +<menubar id="main-menubar"/> \ No newline at end of file diff --git a/im/content/jar.mn b/im/content/jar.mn -index 20ea9dc..b3d9e49 100644 +index 20ea9dce7..b3d9e492f 100644 --- a/im/content/jar.mn +++ b/im/content/jar.mn @@ -10,7 +10,8 @@ instantbird.jar: @@ -4976,7 +4976,7 @@ index 20ea9dc..b3d9e49 100644 content/instantbird/accounts.css content/instantbird/accounts.js diff --git a/im/locales/en-US/chrome/instantbird/aboutDialog.dtd b/im/locales/en-US/chrome/instantbird/aboutDialog.dtd -index ecd8d9d..187cf5c 100644 +index ecd8d9d24..187cf5c3e 100644 --- a/im/locales/en-US/chrome/instantbird/aboutDialog.dtd +++ b/im/locales/en-US/chrome/instantbird/aboutDialog.dtd @@ -1,10 +1,129 @@ @@ -5120,7 +5120,7 @@ index ecd8d9d..187cf5c 100644 +<!ENTITY bottomLinks.license "Licensing Information"> +<!ENTITY tor.TrademarkStatement "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc."> diff --git a/im/locales/en-US/updater/updater.ini b/im/locales/en-US/updater/updater.ini -index 15ec569..4a2d35d 100644 +index 15ec569c1..4a2d35d8a 100644 --- a/im/locales/en-US/updater/updater.ini +++ b/im/locales/en-US/updater/updater.ini @@ -5,4 +5,4 @@ @@ -5130,5 +5130,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.2 +2.11.0 diff --git a/projects/instantbird/0012-Account-picture.patch b/projects/instantbird/0012-Account-picture.patch index a563ce0..3bac128 100644 --- a/projects/instantbird/0012-Account-picture.patch +++ b/projects/instantbird/0012-Account-picture.patch @@ -1,4 +1,4 @@ -From 2ce648e15ef32419459567cf44d928f09ff9f562 Mon Sep 17 00:00:00 2001 +From a8276a289236cd8691b6dece5e4e11d2de7f34b4 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/25] Account picture @@ -8,7 +8,7 @@ Subject: [PATCH 12/25] Account picture 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/im/content/blist.xul b/im/content/blist.xul -index b90fdda..f29a48b 100644 +index b90fddadb..f29a48b99 100644 --- a/im/content/blist.xul +++ b/im/content/blist.xul @@ -114,8 +114,7 @@ @@ -22,5 +22,5 @@ index b90fdda..f29a48b 100644 <panel id="changeUserIconPanel" type="arrow" align="center" -- -2.10.2 +2.11.0 diff --git a/projects/instantbird/0013-Modify-protocol-defaults.patch b/projects/instantbird/0013-Modify-protocol-defaults.patch index 57218e3..e8ad5a3 100644 --- a/projects/instantbird/0013-Modify-protocol-defaults.patch +++ b/projects/instantbird/0013-Modify-protocol-defaults.patch @@ -1,4 +1,4 @@ -From 57702ae527cd5b214f797731e9a1c7653096cb43 Mon Sep 17 00:00:00 2001 +From a10101ffc21977f256ee4ecb7f73af71ab5d7426 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/25] Modify protocol defaults @@ -12,7 +12,7 @@ Subject: [PATCH 13/25] Modify protocol defaults 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/im/content/accountWizard.xul b/im/content/accountWizard.xul -index 759f42b..a306906 100644 +index 759f42b38..a3069061a 100644 --- a/im/content/accountWizard.xul +++ b/im/content/accountWizard.xul @@ -50,7 +50,7 @@ @@ -25,7 +25,7 @@ index 759f42b..a306906 100644 </hbox> </wizardpage> diff --git a/im/locales/en-US/chrome/instantbird/accountWizard.properties b/im/locales/en-US/chrome/instantbird/accountWizard.properties -index d552a23..7d371bd 100644 +index d552a232b..7d371bd21 100644 --- a/im/locales/en-US/chrome/instantbird/accountWizard.properties +++ b/im/locales/en-US/chrome/instantbird/accountWizard.properties @@ -8,11 +8,13 @@ @@ -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.2 +2.11.0 diff --git a/projects/instantbird/0014-Modify-IRC-defaults.patch b/projects/instantbird/0014-Modify-IRC-defaults.patch index 58860e9..92207a1 100644 --- a/projects/instantbird/0014-Modify-IRC-defaults.patch +++ b/projects/instantbird/0014-Modify-IRC-defaults.patch @@ -1,4 +1,4 @@ -From 6de7f7d3d973a6bea2a35462720e30f76c5e3d1c Mon Sep 17 00:00:00 2001 +From aa70417e8646c50aa85598d723acd2099d524a1e 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/25] Modify IRC defaults @@ -14,7 +14,7 @@ Subject: [PATCH 14/25] Modify IRC defaults 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/chat/protocols/irc/irc.js b/chat/protocols/irc/irc.js -index 35165e9..c2167a5 100644 +index 35165e9a9..c2167a5ec 100644 --- a/chat/protocols/irc/irc.js +++ b/chat/protocols/irc/irc.js @@ -1931,7 +1931,7 @@ ircProtocol.prototype = { @@ -27,7 +27,7 @@ index 35165e9..c2167a5 100644 options: { diff --git a/chat/protocols/irc/ircCTCP.jsm b/chat/protocols/irc/ircCTCP.jsm -index 28eb374..120be10 100644 +index 28eb374f4..120be10ee 100644 --- a/chat/protocols/irc/ircCTCP.jsm +++ b/chat/protocols/irc/ircCTCP.jsm @@ -167,19 +167,7 @@ var ctcpBase = { @@ -61,5 +61,5 @@ index 28eb374..120be10 100644 ". Sending TIME response: \"" + now + "\"."); this.sendCTCPMessage(aMessage.origin, true, "TIME", ":" + now); -- -2.10.2 +2.11.0 diff --git a/projects/instantbird/0015-Modify-themes.patch b/projects/instantbird/0015-Modify-themes.patch index d6f2472..9111fa7 100644 --- a/projects/instantbird/0015-Modify-themes.patch +++ b/projects/instantbird/0015-Modify-themes.patch @@ -1,4 +1,4 @@ -From 20f2987874fc704cb3ce5f342ab911538620ac68 Mon Sep 17 00:00:00 2001 +From b5c49b925dc1be8f8ae37e1f9f04c28020be7aa6 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/25] Modify themes @@ -13,7 +13,7 @@ Subject: [PATCH 15/25] Modify themes 3 files changed, 2 insertions(+), 19 deletions(-) diff --git a/im/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf b/im/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf -index a7e38bb..c5c781a 100644 +index a7e38bba4..c5c781a97 100644 --- a/im/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf +++ b/im/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf @@ -26,6 +26,8 @@ @@ -26,7 +26,7 @@ index a7e38bb..c5c781a 100644 <!-- EXTENSION AUTHORS! DO NOT COPY THIS PROPERTY INTO YOUR INSTALL RDF FILES diff --git a/im/content/preferences/themes.js b/im/content/preferences/themes.js -index 5c5d594..4a9d6af 100644 +index 5c5d594cb..4a9d6afd0 100644 --- a/im/content/preferences/themes.js +++ b/im/content/preferences/themes.js @@ -31,21 +31,6 @@ var gThemePane = { @@ -52,7 +52,7 @@ index 5c5d594..4a9d6af 100644 /* Create the drop down list for emoticons and messagestyles; diff --git a/im/content/preferences/themes.xul b/im/content/preferences/themes.xul -index 454e366..18ba1f9 100644 +index 454e36696..18ba1f95c 100644 --- a/im/content/preferences/themes.xul +++ b/im/content/preferences/themes.xul @@ -65,8 +65,6 @@ @@ -74,5 +74,5 @@ index 454e366..18ba1f9 100644 <separator class="thin"/> <description>&emoticonsPreview.description;</description> -- -2.10.2 +2.11.0 diff --git a/projects/instantbird/0016-Modify-XMPP-defaults.patch b/projects/instantbird/0016-Modify-XMPP-defaults.patch index aad94d2..20a960c 100644 --- a/projects/instantbird/0016-Modify-XMPP-defaults.patch +++ b/projects/instantbird/0016-Modify-XMPP-defaults.patch @@ -1,4 +1,4 @@ -From c326a8f3519d31ec6c1a2434a0ead4fa30d7aab0 Mon Sep 17 00:00:00 2001 +From 655f5e07585e180822e6a5a9d6d80f8cb1c4ab09 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/25] Modify XMPP defaults @@ -12,7 +12,7 @@ Subject: [PATCH 16/25] Modify XMPP defaults 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/chat/protocols/gtalk/gtalk.js b/chat/protocols/gtalk/gtalk.js -index 8bce0c9..642f456 100644 +index 8bce0c9b4..642f4561d 100644 --- a/chat/protocols/gtalk/gtalk.js +++ b/chat/protocols/gtalk/gtalk.js @@ -96,7 +96,7 @@ GTalkProtocol.prototype = { @@ -25,7 +25,7 @@ index 8bce0c9..642f456 100644 get chatHasTopic() { return true; }, classID: Components.ID("{38a224c1-6748-49a9-8ab2-efc362b1000d}") diff --git a/chat/protocols/xmpp/xmpp.js b/chat/protocols/xmpp/xmpp.js -index 265445a..a5635ca 100644 +index 265445a18..a5635cae3 100644 --- a/chat/protocols/xmpp/xmpp.js +++ b/chat/protocols/xmpp/xmpp.js @@ -31,12 +31,12 @@ XMPPProtocol.prototype = { @@ -44,5 +44,5 @@ index 265445a..a5635ca 100644 connection_security: { get label() { return _("options.connectionSecurity"); }, -- -2.10.2 +2.11.0 diff --git a/projects/instantbird/0017-Remove-logging-UI.patch b/projects/instantbird/0017-Remove-logging-UI.patch index df865b8..6c4504e 100644 --- a/projects/instantbird/0017-Remove-logging-UI.patch +++ b/projects/instantbird/0017-Remove-logging-UI.patch @@ -1,4 +1,4 @@ -From 3270c324549b70ae92a09b3c28ba84bfd65c61e0 Mon Sep 17 00:00:00 2001 +From cafc07fcac360ccd5248a6798dfb7706788fe4fe 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/25] Remove logging UI @@ -8,7 +8,7 @@ Subject: [PATCH 17/25] Remove logging UI 1 file changed, 20 deletions(-) diff --git a/im/content/preferences/privacy.xul b/im/content/preferences/privacy.xul -index 7c9db1c..2d7b270 100644 +index 7c9db1cdd..2d7b2701e 100644 --- a/im/content/preferences/privacy.xul +++ b/im/content/preferences/privacy.xul @@ -66,26 +66,6 @@ @@ -39,5 +39,5 @@ index 7c9db1c..2d7b270 100644 <groupbox id="passwordsGroup" orient="vertical"> <caption label="&passwords.label;"/> -- -2.10.2 +2.11.0 diff --git a/projects/instantbird/0018-Cert-override.patch b/projects/instantbird/0018-Cert-override.patch index 2c7d611..c6b033a 100644 --- a/projects/instantbird/0018-Cert-override.patch +++ b/projects/instantbird/0018-Cert-override.patch @@ -1,4 +1,4 @@ -From ccf46a070de2d8bdf3edabbebd42bb8c5e55388f Mon Sep 17 00:00:00 2001 +From 20e5243b68e4ed887acee55954affdb33fbac423 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/25] Cert override @@ -13,7 +13,7 @@ Subject: [PATCH 18/25] Cert override diff --git a/im/app/profile/cert_override.txt b/im/app/profile/cert_override.txt new file mode 100644 -index 0000000..4e616f6 +index 000000000..4e616f6cf --- /dev/null +++ b/im/app/profile/cert_override.txt @@ -0,0 +1,3 @@ @@ -21,7 +21,7 @@ index 0000000..4e616f6 +# This is a generated file! Do not edit. +jabber.ccc.de:5222 OID.2.16.840.1.101.3.4.2.1 59:2F:46:18:35:27:AB:40:83:88:82:AB:4C:B4:AE:F4:E2:CF:91:60:74:AB:01:F9:BC:24:39:31:CA:5C:4E:D1 U AAAAAAAAAAAAAAADAAAAexFL3TB5MRAwDgYDVQQKEwdSb290IENBMR4wHAYDVQQL ExVodHRwOi8vd3d3LmNhY2VydC5vcmcxIjAgBgNVBAMTGUNBIENlcnQgU2lnbmlu ZyBBdXRob3JpdHkxITAfBgkqhkiG9w0BCQEWEnN1cHBvcnRAY2FjZXJ0Lm9yZw== diff --git a/im/app/profile/moz.build b/im/app/profile/moz.build -index 46bc16b..b7d4ebd 100644 +index 46bc16bd1..b7d4ebd4b 100644 --- a/im/app/profile/moz.build +++ b/im/app/profile/moz.build @@ -9,6 +9,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'mac', 'cocoa'): @@ -33,7 +33,7 @@ index 46bc16b..b7d4ebd 100644 'mimeTypes.rdf', ] diff --git a/im/installer/Makefile.in b/im/installer/Makefile.in -index 25dd676..5f06e78 100644 +index 25dd67617..5f06e784c 100644 --- a/im/installer/Makefile.in +++ b/im/installer/Makefile.in @@ -109,7 +109,9 @@ MOZ_PKG_MAC_ICON=branding/disk.icns @@ -48,7 +48,7 @@ index 25dd676..5f06e78 100644 INSTALL_SDK = 1 diff --git a/im/installer/package-manifest.in b/im/installer/package-manifest.in -index 1174b3d..3e35a2e 100644 +index 1174b3dfd..3e35a2e1b 100644 --- a/im/installer/package-manifest.in +++ b/im/installer/package-manifest.in @@ -160,6 +160,7 @@ @@ -60,5 +60,5 @@ index 1174b3d..3e35a2e 100644 #ifdef XP_MACOSX @RESPATH@/components/ibDockBadge.js -- -2.10.2 +2.11.0 diff --git a/projects/instantbird/0019-Display-all-traffic-over-Tor.patch b/projects/instantbird/0019-Display-all-traffic-over-Tor.patch index dfebfc0..90fa7fd 100644 --- a/projects/instantbird/0019-Display-all-traffic-over-Tor.patch +++ b/projects/instantbird/0019-Display-all-traffic-over-Tor.patch @@ -1,4 +1,4 @@ -From 86bdc8f65a2a8cc75c0b58b64f0edf3a98f1a5fd Mon Sep 17 00:00:00 2001 +From 9def66dc758ccdfb179d47b3b6cce29531a38018 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/25] Display all traffic over Tor @@ -9,7 +9,7 @@ Subject: [PATCH 19/25] Display all traffic over Tor 2 files changed, 3 insertions(+) diff --git a/im/content/accountWizard.xul b/im/content/accountWizard.xul -index a306906..3c3a417 100644 +index a3069061a..3c3a4179b 100644 --- a/im/content/accountWizard.xul +++ b/im/content/accountWizard.xul @@ -39,6 +39,8 @@ @@ -22,7 +22,7 @@ index a306906..3c3a417 100644 <wizardpage id="accountprotocol" pageid="accountprotocol" next="accountusername" diff --git a/im/locales/en-US/chrome/instantbird/accountWizard.dtd b/im/locales/en-US/chrome/instantbird/accountWizard.dtd -index c46fb2f..6b49c84 100644 +index c46fb2f95..6b49c84fa 100644 --- a/im/locales/en-US/chrome/instantbird/accountWizard.dtd +++ b/im/locales/en-US/chrome/instantbird/accountWizard.dtd @@ -6,6 +6,7 @@ @@ -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.2 +2.11.0 diff --git a/projects/instantbird/0020-Trac-17480-Content-sink.patch b/projects/instantbird/0020-Trac-17480-Content-sink.patch index 488776c..7c52152 100644 --- a/projects/instantbird/0020-Trac-17480-Content-sink.patch +++ b/projects/instantbird/0020-Trac-17480-Content-sink.patch @@ -1,4 +1,4 @@ -From d8136d469553e45875c549cb94d9d6796f577968 Mon Sep 17 00:00:00 2001 +From 5f45a049d67f31ed6cc753ad539ddb9144ff7ddf 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/25] Trac 17480: Content sink @@ -9,7 +9,7 @@ Subject: [PATCH 20/25] Trac 17480: Content sink 2 files changed, 7 insertions(+), 28 deletions(-) diff --git a/chat/modules/imContentSink.jsm b/chat/modules/imContentSink.jsm -index abd95fc..fa32442 100644 +index abd95fc71..fa32442e4 100644 --- a/chat/modules/imContentSink.jsm +++ b/chat/modules/imContentSink.jsm @@ -42,7 +42,7 @@ this.EXPORTED_SYMBOLS = [ @@ -94,7 +94,7 @@ index abd95fc..fa32442 100644 return kModes[baseNum]; } diff --git a/im/content/preferences/content.xul b/im/content/preferences/content.xul -index 3b8ccfa..ba41da7 100644 +index 3b8ccfa2b..ba41da76a 100644 --- a/im/content/preferences/content.xul +++ b/im/content/preferences/content.xul @@ -35,7 +35,7 @@ @@ -107,5 +107,5 @@ index 3b8ccfa..ba41da7 100644 <menuitem value="0" label="&filterLevelNone;"/> </menupopup> -- -2.10.2 +2.11.0 diff --git a/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch b/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch index 7629d5b..dd6a659 100644 --- a/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch +++ b/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch @@ -1,4 +1,4 @@ -From 2924c20a36d541422d95f05cfa5b078526363fae Mon Sep 17 00:00:00 2001 +From 049adcc7cc828fdb3e68467cc8acc57778f2deaf 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/25] SASL ECDSA-NIST256P-CHALLENGE @@ -12,7 +12,7 @@ Subject: [PATCH 21/25] SASL ECDSA-NIST256P-CHALLENGE create mode 100644 chat/protocols/irc/elliptic.jsm diff --git a/chat/components/src/imAccounts.js b/chat/components/src/imAccounts.js -index 5bfea57..da8525f 100644 +index 5bfea57f2..da8525ffd 100644 --- a/chat/components/src/imAccounts.js +++ b/chat/components/src/imAccounts.js @@ -193,6 +193,7 @@ function imAccount(aKey, aName, aPrplId) @@ -25,7 +25,7 @@ index 5bfea57..da8525f 100644 id: "", diff --git a/chat/protocols/irc/elliptic.jsm b/chat/protocols/irc/elliptic.jsm new file mode 100644 -index 0000000..bccab01 +index 000000000..bccab018c --- /dev/null +++ b/chat/protocols/irc/elliptic.jsm @@ -0,0 +1,8748 @@ @@ -8779,7 +8779,7 @@ index 0000000..bccab01 +var elliptic = window.elliptic; \ No newline at end of file diff --git a/chat/protocols/irc/ircSASL.jsm b/chat/protocols/irc/ircSASL.jsm -index 561f055..8a2bd70 100644 +index 561f055e0..8a2bd70aa 100644 --- a/chat/protocols/irc/ircSASL.jsm +++ b/chat/protocols/irc/ircSASL.jsm @@ -14,6 +14,43 @@ var Cu = Components.utils; @@ -8903,7 +8903,7 @@ index 561f055..8a2bd70 100644 return true; diff --git a/chat/protocols/irc/moz.build b/chat/protocols/irc/moz.build -index bc25396..e46815d 100644 +index bc2539687..e46815dfe 100644 --- a/chat/protocols/irc/moz.build +++ b/chat/protocols/irc/moz.build @@ -11,6 +11,7 @@ EXTRA_COMPONENTS += [ @@ -8915,5 +8915,5 @@ index bc25396..e46815d 100644 'ircCAP.jsm', 'ircCommands.jsm', -- -2.10.2 +2.11.0 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 8d181d1..d02fe5a 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,4 +1,4 @@ -From 7e4e89fd1a5a14bf2b4afdc32a83e08f759244b9 Mon Sep 17 00:00:00 2001 +From 1ec3e4cd7e820648086460bfbadc26cf43e7945f Mon Sep 17 00:00:00 2001 From: aleth <aleth@instantbird.org> Date: Wed, 26 Oct 2016 20:16:58 +0200 Subject: [PATCH 22/25] Bug 1313137 - "msg is not defined" error in @@ -11,7 +11,7 @@ extra : rebase_source : 5752a69059ecd48b947809ef12de177ccab8528f 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 +index c2167a5ec..b58c2c2eb 100644 --- a/chat/protocols/irc/irc.js +++ b/chat/protocols/irc/irc.js @@ -1289,7 +1289,8 @@ ircAccount.prototype = { @@ -25,5 +25,5 @@ index c2167a5..b58c2c2 100644 }, -- -2.10.2 +2.11.0 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 c3335f0..9c3886a 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,4 +1,4 @@ -From 0dc553e078f0d6f7c493baac6757b17bb6bf613b Mon Sep 17 00:00:00 2001 +From b7d7b3ed7b73f1b46a6334e3d358bace8228b732 Mon Sep 17 00:00:00 2001 From: aleth <aleth@instantbird.org> Date: Thu, 12 May 2016 15:10:43 +0200 Subject: [PATCH 23/25] Bug 954368 - Contact list entries should adapt their @@ -18,7 +18,7 @@ extra : rebase_source : 9820f3a68794f98260f3ac406772da6d176d02ec 8 files changed, 92 insertions(+), 53 deletions(-) diff --git a/chat/themes/imtooltip.css b/chat/themes/imtooltip.css -index c4525be..630da39 100644 +index c4525beb5..630da3983 100644 --- a/chat/themes/imtooltip.css +++ b/chat/themes/imtooltip.css @@ -31,6 +31,7 @@ @@ -30,7 +30,7 @@ index c4525be..630da39 100644 .tooltipDisplayName { diff --git a/im/content/blist.css b/im/content/blist.css -index d47e4f3..15b61b1 100644 +index d47e4f356..15b61b103 100644 --- a/im/content/blist.css +++ b/im/content/blist.css @@ -30,15 +30,28 @@ group { @@ -111,7 +111,7 @@ index d47e4f3..15b61b1 100644 -moz-binding: url("chrome://chat/content/imtooltip.xml#tooltip"); } diff --git a/im/content/blist.js b/im/content/blist.js -index 9ec10e2..ce76ffc 100644 +index 9ec10e25c..ce76ffcd7 100644 --- a/im/content/blist.js +++ b/im/content/blist.js @@ -820,6 +820,13 @@ var buddyList = { @@ -129,7 +129,7 @@ index 9ec10e2..ce76ffc 100644 blistBox.removeGroup = function(aGroupElt) { let index = buddyList._displayedGroups.indexOf(aGroupElt); diff --git a/im/content/blist.xul b/im/content/blist.xul -index f29a48b..71ee2c9 100644 +index f29a48b99..71ee2c9ef 100644 --- a/im/content/blist.xul +++ b/im/content/blist.xul @@ -224,6 +224,10 @@ @@ -144,7 +144,7 @@ index f29a48b..71ee2c9 100644 onclick='document.getElementById("buddylistbox").focus();'/> </notificationbox> diff --git a/im/content/contact.xml b/im/content/contact.xml -index 5fc36dd..f2b4641 100644 +index 5fc36dd6e..f2b464182 100644 --- a/im/content/contact.xml +++ b/im/content/contact.xml @@ -16,11 +16,11 @@ @@ -219,7 +219,7 @@ index 5fc36dd..f2b4641 100644 <children/> </xul:vbox> diff --git a/im/content/conv.xml b/im/content/conv.xml -index 96a33af..c41da6f 100644 +index 96a33af64..c41da6fb4 100644 --- a/im/content/conv.xml +++ b/im/content/conv.xml @@ -16,11 +16,11 @@ @@ -240,7 +240,7 @@ index 96a33af..c41da6f 100644 anonid="displayname" class="convDisplayName blistDisplayName" xbl:inherits="value=displayname,status"/> diff --git a/im/locales/en-US/chrome/instantbird/instantbird.dtd b/im/locales/en-US/chrome/instantbird/instantbird.dtd -index 80b8948..fce965b 100644 +index 80b894862..fce965bb1 100644 --- a/im/locales/en-US/chrome/instantbird/instantbird.dtd +++ b/im/locales/en-US/chrome/instantbird/instantbird.dtd @@ -95,6 +95,12 @@ @@ -257,7 +257,7 @@ index 80b8948..fce965b 100644 <!ENTITY openConversationCmd.label "Start a conversation"> <!ENTITY openConversationCmd.accesskey "c"> diff --git a/im/themes/blist.css b/im/themes/blist.css -index 9922674..c033b51 100644 +index 992267405..c033b51bc 100644 --- a/im/themes/blist.css +++ b/im/themes/blist.css @@ -100,14 +100,7 @@ group { @@ -318,5 +318,5 @@ index 9922674..c033b51 100644 min-width: 16px; } -- -2.10.2 +2.11.0 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 index e176a3e..17f631d 100644 --- 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 @@ -1,4 +1,4 @@ -From 995d262e94b51a893c40bcb20c7f92dbcb68bad7 Mon Sep 17 00:00:00 2001 +From 0331be740d906116cc07dceae0d6163442e4e844 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/25] Bug 1187281 - Only show "close" button on Windows @@ -8,7 +8,7 @@ Subject: [PATCH 24/25] Bug 1187281 - Only show "close" button on Windows 1 file changed, 2 insertions(+) diff --git a/im/content/accounts.xul b/im/content/accounts.xul -index f3f1c6b..d683562 100644 +index f3f1c6bbb..d683562cb 100644 --- a/im/content/accounts.xul +++ b/im/content/accounts.xul @@ -142,6 +142,8 @@ @@ -21,5 +21,5 @@ index f3f1c6b..d683562 100644 </windowdragbox> </window> -- -2.10.2 +2.11.0 diff --git a/projects/instantbird/0025-Bug-1316000-Remove-old-Yahoo-Messenger-support.-r-al.patch b/projects/instantbird/0025-Bug-1316000-Remove-old-Yahoo-Messenger-support.-r-al.patch index 26d7f65..4ba93ef 100644 --- a/projects/instantbird/0025-Bug-1316000-Remove-old-Yahoo-Messenger-support.-r-al.patch +++ b/projects/instantbird/0025-Bug-1316000-Remove-old-Yahoo-Messenger-support.-r-al.patch @@ -1,4 +1,4 @@ -From d63bca2d8110c2f0db343cee17e81ea6f5943020 Mon Sep 17 00:00:00 2001 +From 81b882c16f8216a889e1d6beb1035d8187a59df7 Mon Sep 17 00:00:00 2001 From: Patrick Cloke <clokep@gmail.com> Date: Wed, 9 Nov 2016 09:03:49 -0800 Subject: [PATCH 25/25] Bug 1316000 - Remove old Yahoo! Messenger support. @@ -28,7 +28,7 @@ Subject: [PATCH 25/25] Bug 1316000 - Remove old Yahoo! Messenger support. delete mode 100644 chat/protocols/yahoo/yahoo-session.jsm diff --git a/chat/chat-prefs.js b/chat/chat-prefs.js -index fb76916..60b9c1e 100644 +index fb769163d..60b9c1e8c 100644 --- a/chat/chat-prefs.js +++ b/chat/chat-prefs.js @@ -84,6 +84,8 @@ pref("chat.irc.automaticList", true); @@ -41,7 +41,7 @@ index fb76916..60b9c1e 100644 // loglevel is the minimum severity level that a libpurple message // must have to be reported in the Error Console. diff --git a/chat/locales/en-US/facebook.properties b/chat/locales/en-US/facebook.properties -index aaf7cdc..2e00cbc 100644 +index aaf7cdc9c..2e00cbcb2 100644 --- a/chat/locales/en-US/facebook.properties +++ b/chat/locales/en-US/facebook.properties @@ -2,6 +2,5 @@ @@ -53,7 +53,7 @@ index aaf7cdc..2e00cbc 100644 facebook.chat.name=Facebook Chat +facebook.disabled=Facebook Chat is no longer supported due to Facebook disabling their XMPP gateway. diff --git a/chat/locales/en-US/yahoo.properties b/chat/locales/en-US/yahoo.properties -index 727faa6..89ee009 100644 +index 727faa6ee..89ee0093c 100644 --- a/chat/locales/en-US/yahoo.properties +++ b/chat/locales/en-US/yahoo.properties @@ -2,36 +2,4 @@ @@ -95,7 +95,7 @@ index 727faa6..89ee009 100644 -command.feedback.invite=You have invited %S to the conference. +yahoo.disabled=Yahoo Messenger is no longer supported due to Yahoo disabling their legacy protocol. diff --git a/chat/protocols/facebook/facebook.js b/chat/protocols/facebook/facebook.js -index 7b5b3b8..9d90eac 100644 +index 7b5b3b86e..9d90eacdb 100644 --- a/chat/protocols/facebook/facebook.js +++ b/chat/protocols/facebook/facebook.js @@ -6,33 +6,26 @@ var {interfaces: Ci, utils: Cu} = Components; @@ -136,7 +136,7 @@ index 7b5b3b8..9d90eac 100644 __proto__: GenericProtocolPrototype, get normalizedName() { return "facebook"; }, diff --git a/chat/protocols/yahoo/moz.build b/chat/protocols/yahoo/moz.build -index f144347..ea37853 100644 +index f14434732..ea378535a 100644 --- a/chat/protocols/yahoo/moz.build +++ b/chat/protocols/yahoo/moz.build @@ -3,15 +3,9 @@ @@ -157,7 +157,7 @@ index f144347..ea37853 100644 JAR_MANIFESTS += ['jar.mn'] diff --git a/chat/protocols/yahoo/test/test_yahooAccount.js b/chat/protocols/yahoo/test/test_yahooAccount.js deleted file mode 100644 -index 51df00b..0000000 +index 51df00bb9..000000000 --- a/chat/protocols/yahoo/test/test_yahooAccount.js +++ /dev/null @@ -1,98 +0,0 @@ @@ -261,7 +261,7 @@ index 51df00b..0000000 -} diff --git a/chat/protocols/yahoo/test/test_yahooLoginHelper.js b/chat/protocols/yahoo/test/test_yahooLoginHelper.js deleted file mode 100644 -index e4d8bc1..0000000 +index e4d8bc1b8..000000000 --- a/chat/protocols/yahoo/test/test_yahooLoginHelper.js +++ /dev/null @@ -1,89 +0,0 @@ @@ -356,7 +356,7 @@ index e4d8bc1..0000000 -} diff --git a/chat/protocols/yahoo/test/test_yahoopacket.js b/chat/protocols/yahoo/test/test_yahoopacket.js deleted file mode 100644 -index 7908c44..0000000 +index 7908c4429..000000000 --- a/chat/protocols/yahoo/test/test_yahoopacket.js +++ /dev/null @@ -1,217 +0,0 @@ @@ -579,7 +579,7 @@ index 7908c44..0000000 -} diff --git a/chat/protocols/yahoo/test/xpcshell.ini b/chat/protocols/yahoo/test/xpcshell.ini deleted file mode 100644 -index f4b464e..0000000 +index f4b464e61..000000000 --- a/chat/protocols/yahoo/test/xpcshell.ini +++ /dev/null @@ -1,7 +0,0 @@ @@ -592,7 +592,7 @@ index f4b464e..0000000 -[test_yahoopacket.js] diff --git a/chat/protocols/yahoo/yahoo-session.jsm b/chat/protocols/yahoo/yahoo-session.jsm deleted file mode 100644 -index cc96120..0000000 +index cc9612036..000000000 --- a/chat/protocols/yahoo/yahoo-session.jsm +++ /dev/null @@ -1,1156 +0,0 @@ @@ -1753,7 +1753,7 @@ index cc96120..0000000 - } -}; diff --git a/chat/protocols/yahoo/yahoo.js b/chat/protocols/yahoo/yahoo.js -index 8beadb5..86a2589 100644 +index 8beadb504..86a258969 100644 --- a/chat/protocols/yahoo/yahoo.js +++ b/chat/protocols/yahoo/yahoo.js @@ -2,575 +2,39 @@ @@ -2341,7 +2341,7 @@ index 8beadb5..86a2589 100644 classID: Components.ID("{50ea817e-5d79-4657-91ae-aa0a52bdb98c}") }; diff --git a/im/content/conversation.xml b/im/content/conversation.xml -index 6f00c8d..c93dab0 100644 +index 6f00c8d39..c93dab00f 100644 --- a/im/content/conversation.xml +++ b/im/content/conversation.xml @@ -342,8 +342,7 @@ @@ -2355,7 +2355,7 @@ index 6f00c8d..c93dab0 100644 if ("color" in style) styleAttributes += " color=\"" + style.color + "\""; diff --git a/im/locales/en-US/chrome/instantbird/accountWizard.properties b/im/locales/en-US/chrome/instantbird/accountWizard.properties -index 7d371bd..1d6fd48 100644 +index 7d371bd21..1d6fd48e1 100644 --- a/im/locales/en-US/chrome/instantbird/accountWizard.properties +++ b/im/locales/en-US/chrome/instantbird/accountWizard.properties @@ -14,9 +14,8 @@ topProtocol.list=prpl-irc,prpl-jabber,prpl-twitter,prpl-gtalk @@ -2370,7 +2370,7 @@ index 7d371bd..1d6fd48 100644 topProtocol.prpl-irc.description=Join IRC channels +topProtocol.prpl-jabber.description=Chat using the open Jabber/XMPP protocol diff --git a/im/test/xpcshell.ini b/im/test/xpcshell.ini -index 5f7dd70..578122a 100644 +index 5f7dd70fc..578122a2a 100644 --- a/im/test/xpcshell.ini +++ b/im/test/xpcshell.ini @@ -6,5 +6,4 @@ @@ -2380,7 +2380,7 @@ index 5f7dd70..578122a 100644 -[include:chat/protocols/yahoo/test/xpcshell.ini] #[include:extensions/purple/purplexpcom/src/test/xpcshell.ini] diff --git a/mail/components/im/content/imconversation.xml b/mail/components/im/content/imconversation.xml -index 16c665a..a4b9fc6 100644 +index 16c665ab4..a4b9fc638 100644 --- a/mail/components/im/content/imconversation.xml +++ b/mail/components/im/content/imconversation.xml @@ -285,8 +285,7 @@ @@ -2394,5 +2394,5 @@ index 16c665a..a4b9fc6 100644 if ("color" in style) styleAttributes += " color=\"" + style.color + "\""; -- -2.10.2 +2.11.0