[tor-commits] [tor-messenger-build/master] Rebase xmpp-inband-registration.patch

[arlo at torproject.org]

commit fa1cf39170aeae0ab080612dd4cb7898de09a9d7
Author: Sukhbir Singh <sukhbir at torproject.org>
Date:   Sat Mar 19 07:55:22 2016 -0400

    Rebase xmpp-inband-registration.patch
---
 .../instantbird/xmpp-inband-registration.patch     | 67 ++++------------------
 1 file changed, 11 insertions(+), 56 deletions(-)

diff --git a/projects/instantbird/xmpp-inband-registration.patch b/projects/instantbird/xmpp-inband-registration.patch
index b669c21..cdf4b31 100644
--- a/projects/instantbird/xmpp-inband-registration.patch
+++ b/projects/instantbird/xmpp-inband-registration.patch
@@ -29,7 +29,7 @@ diff --git a/chat/protocols/xmpp/xmpp-session.jsm b/chat/protocols/xmpp/xmpp-ses
  
 +const registerWindow = "chrome://instantbird/content/xmppRegister.xul";
 +
- XPCOMUtils.defineLazyGetter(this, "_", function()
+ XPCOMUtils.defineLazyGetter(this, "_", () =>
    l10nHelper("chrome://chat/locale/xmpp.properties")
  );
 @@ -68,6 +70,7 @@
@@ -132,57 +132,32 @@ diff --git a/chat/protocols/xmpp/xmpp-session.jsm b/chat/protocols/xmpp/xmpp-ses
 diff --git a/im/content/accountWizard.js b/im/content/accountWizard.js
 --- a/im/content/accountWizard.js
 +++ b/im/content/accountWizard.js
-@@ -106,16 +106,22 @@ var accountWizard = {
-   },
- 
-   showUsernamePage: function aw_showUsernamePage() {
-     let proto = this.proto.id;
-     if ("userNameBoxes" in this && this.userNameProto == proto) {
-       this.checkUsername();
+@@ -119,6 +119,12 @@
        return;
      }
-+    
+ 
 +    if (this.proto.id == "prpl-jabber") {
 +      document.getElementById("registerXMPP").hidden = false;
 +    } else {
 +      document.getElementById("registerXMPP").hidden = true;
 +    }
- 
++
      let bundle = document.getElementById("accountsBundle");
      let usernameInfo;
      let emptyText = this.proto.usernameEmptyText;
-     if (emptyText) {
-       usernameInfo =
-         bundle.getFormattedString("accountUsernameInfoWithDescription",
-                                   [emptyText, this.proto.name]);
-@@ -412,16 +418,18 @@ var accountWizard = {
-   createAccount: function aw_createAccount() {
-     let acc = Services.accounts.createAccount(this.username, this.proto.id);
-     if (!this.proto.noPassword && this.password)
-       acc.password = this.password;
-     if (this.alias)
+@@ -424,6 +430,8 @@
        acc.alias = this.alias;
      //FIXME: newMailNotification
  
 +    acc.setBool("register", document.getElementById("registerXMPP").checked);
-+
++    
      for (let i = 0; i < this.prefs.length; ++i) {
        let option = this.prefs[i];
        let opt = option.opt;
-       switch(opt.type) {
-       case opt.typeBool:
-         acc.setBool(option.name, option.value);
-         break;
-       case opt.typeInt:
 diff --git a/im/content/accountWizard.xul b/im/content/accountWizard.xul
 --- a/im/content/accountWizard.xul
 +++ b/im/content/accountWizard.xul
-@@ -60,16 +60,17 @@
-               onpageshow="accountWizard.showUsernamePage();"
-               onpagehide="accountWizard.hideUsernamePage();"
-               onpagerewound="return accountWizard.rewindFromUsernamePage();">
-     <description id="usernameInfo"/>
-     <separator/>
+@@ -65,6 +65,7 @@
      <vbox id="userNameBox"/>
      <separator/>
      <description id="duplicateAccount" hidden="true">&accountUsernameDuplicate.label;</description>
@@ -190,42 +165,22 @@ diff --git a/im/content/accountWizard.xul b/im/content/accountWizard.xul
    </wizardpage>
  
    <wizardpage id="accountpassword" pageid="accountpassword" next="accountadvanced"
-               label="&accountPasswordTitle.label;">
-     <description>&accountPasswordInfo.label;</description>
-     <separator/>
-     <hbox id="passwordBox" align="baseline">
-       <label value="&accountPasswordField.label;" control="password" id="passwordLabel"/>
 diff --git a/im/content/jar.mn b/im/content/jar.mn
 --- a/im/content/jar.mn
 +++ b/im/content/jar.mn
-@@ -56,16 +56,18 @@ instantbird.jar:
- 	content/instantbird/proxies.css
- 	content/instantbird/proxy.xml
- *	content/instantbird/tabbrowser.xml
- 	content/instantbird/tabbrowser.css
- 	content/instantbird/utilities.js
+@@ -61,6 +61,8 @@
  *	content/instantbird/viewlog.xul
  	content/instantbird/viewlog.js
  	content/instantbird/viewlog.css
-+*   content/instantbird/xmppRegister.xul
-+    content/instantbird/xmppRegister.js
++*	content/instantbird/xmppRegister.xul
++	content/instantbird/xmppRegister.js
  #ifdef XP_MACOSX
  *	content/instantbird/hiddenWindow.xul
  	content/instantbird/menus-mac.xul
- 	content/instantbird/macgestures.js
- *	content/instantbird/jsConsoleOverlay.xul
- *	content/instantbird/softwareUpdateOverlay.xul
- #elifdef XP_WIN
- 	content/instantbird/menus-win.xul
 diff --git a/im/locales/en-US/chrome/instantbird/accountWizard.dtd b/im/locales/en-US/chrome/instantbird/accountWizard.dtd
 --- a/im/locales/en-US/chrome/instantbird/accountWizard.dtd
 +++ b/im/locales/en-US/chrome/instantbird/accountWizard.dtd
-@@ -26,8 +26,10 @@
- <!ENTITY accountAliasInfo.label       "This will only be displayed in your conversations when you talk, remote buddies won't see it.">
- <!ENTITY accountProxySettings.caption "Proxy Settings">
- <!ENTITY accountProxySettings.change.label     "Change…">
- <!ENTITY accountProxySettings.change.accessKey "C">
- 
+@@ -31,3 +31,5 @@
  <!ENTITY accountSummaryTitle.label   "Summary">
  <!ENTITY accountSummaryInfo.label    "A summary of the information you entered is displayed below. Please check it before the account is created.">
  <!ENTITY accountSummary.connectAutomatically.label "Connect this account automatically.">