commit 9694d0436fdc8185b89654ba181a518470933169 Author: Sukhbir Singh sukhbir@torproject.org Date: Mon May 11 04:26:44 2015 -0400

Update patches for XMPP known servers --- projects/instantbird/xmpp-onion-js.patch | 26 +++++++++++++++----------- projects/instantbird/xmpp-onion-locale.patch | 4 ++-- projects/instantbird/xmpp-onion-xul.patch | 10 +--------- 3 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/projects/instantbird/xmpp-onion-js.patch b/projects/instantbird/xmpp-onion-js.patch index 54339ac..d04c78b 100644 --- a/projects/instantbird/xmpp-onion-js.patch +++ b/projects/instantbird/xmpp-onion-js.patch @@ -1,5 +1,5 @@ diff --git a/im/content/accountWizard.js b/im/content/accountWizard.js -index 707f1c7..2ca929a 100644 +index 707f1c7..f27ae92 100644 --- a/im/content/accountWizard.js +++ b/im/content/accountWizard.js @@ -7,6 +7,14 @@ Cu.import("resource:///modules/imServices.jsm"); @@ -69,17 +69,21 @@ index 707f1c7..2ca929a 100644

let proxyVisible = this.proto.usePurpleProxy; if (proxyVisible) { -@@ -407,6 +440,13 @@ var accountWizard = { +@@ -405,7 +438,16 @@ var accountWizard = { + for (let i = 0; i < this.prefs.length; ++i) { + let opt = this.prefs[i]; let label = bundle.getFormattedString("accountColon", [opt.opt.label]); - rows.appendChild(this.createSummaryRow(label, opt.value)); +- rows.appendChild(this.createSummaryRow(label, opt.value)); ++ if (this.onionAddress && label == "Server:") { ++ let wizardBundle = document.getElementById("topProtocolsBundle"); ++ let onionLabel = wizardBundle.getFormattedString("onionAddress.label", ++ [this.jabberDomain.value]); ++ rows.appendChild(this.createSummaryRow(label, opt.value)); ++ rows.appendChild(this.createSummaryRow("", onionLabel)); ++ } ++ else { ++ rows.appendChild(this.createSummaryRow(label, opt.value)); ++ } } -+ -+ if (this.onionAddress) { -+ let onionLabel = document.getElementById("topProtocolsBundle"); -+ let onion = document.getElementById("onionAddress"); -+ onion.value = onionLabel.getFormattedString("onionAddress.label", -+ [this.jabberDomain.value, this.onionAddress]); -+ } },

- createAccount: function aw_createAccount() { diff --git a/projects/instantbird/xmpp-onion-locale.patch b/projects/instantbird/xmpp-onion-locale.patch index a04fe94..3744907 100644 --- a/projects/instantbird/xmpp-onion-locale.patch +++ b/projects/instantbird/xmpp-onion-locale.patch @@ -1,5 +1,5 @@ diff --git a/im/locales/en-US/chrome/instantbird/accountWizard.properties b/im/locales/en-US/chrome/instantbird/accountWizard.properties -index 77dd6dd..7ee9bce 100644 +index 77dd6dd..8fa4c4f 100644 --- a/im/locales/en-US/chrome/instantbird/accountWizard.properties +++ b/im/locales/en-US/chrome/instantbird/accountWizard.properties @@ -19,3 +19,5 @@ topProtocol.prpl-twitter.description=Stay up to date with your Twitter timeline @@ -7,4 +7,4 @@ index 77dd6dd..7ee9bce 100644 topProtocol.prpl-msn.description=Microsoft Windows Live Messenger (formerly MSN) topProtocol.prpl-yahoo.description=Chat with friends using Yahoo! Messenger + -+onionAddress.label=We will secure your connection to %S by connecting to %S. ++onionAddress.label=(Secure connection to %S) diff --git a/projects/instantbird/xmpp-onion-xul.patch b/projects/instantbird/xmpp-onion-xul.patch index 9547d75..5707435 100644 --- a/projects/instantbird/xmpp-onion-xul.patch +++ b/projects/instantbird/xmpp-onion-xul.patch @@ -1,5 +1,5 @@ diff --git a/im/content/accountWizard.xul b/im/content/accountWizard.xul -index 5fa5b82..d9ce335 100644 +index 5fa5b82..89f88fe 100644 --- a/im/content/accountWizard.xul +++ b/im/content/accountWizard.xul @@ -59,7 +59,8 @@ @@ -21,11 +21,3 @@ index 5fa5b82..d9ce335 100644 onkeypress="accountWizard.onGroupboxKeypress(event)"> <caption id="protoSpecificCaption" onclick="accountWizard.toggleGroupbox('protoSpecificGroupbox')"/> -@@ -137,6 +138,7 @@ - </columns> - <rows id="summaryRows"/> - </grid> -+ <description id="onionAddress" /> - <separator/> - <checkbox id="connectAutomatically" label= "&accountSummary.connectAutomatically.label;" checked="true"/> - </wizardpage>