Merge lp:~mikemc/ubuntuone-credentials/switch-from-2fa into lp:ubuntuone-credentials

[Mike McCracken]

- Properly handle switching to the register screen after logging in partially with a 2fa account.

- Properly handle switching to the register screen after logging in partially with a 2fa account.

Probably no one will ever try this but it ought to work anyway.

PS, this doesn't depend on the fix-tabloop branch but I did test with that branch merged in, and the tab loop still works after you switch.

TO TEST ON SAUCY desktop:
sudo apt-get build-dep ubuntuone-credentials
sudo apt-get install ubuntu-system-settings
branch this , cd into it
mkdir build
cmake -DLIB_SUFFIX=/i386-linux-gnu -DCMAKE_INSTALL_PREFIX=/usr ..
sudo make install

- run /usr/bin/system-settings
- click on "accounts":
 IF you see a list of existing accounts, click on "Add account" at the bottom, then "Ubuntu One".
 IF you see a screen saying "no accounts", click on "Ubuntu One" in the list below.

- log in with an account that requires 2fa.
- wait for the 2fa box to show
- click on the "I am a new Ubuntu One User" switch

You should now see the register UI and be able to register a new account.

[dobey (dobey)]

review: Approve

[Roberto Alsina (ralsina)]

review: Approve

=== modified file 'online-accounts-provider/NewAccount.qml'
--- online-accounts-provider/NewAccount.qml	2013-09-13 18:31:34 +0000
+++ online-accounts-provider/NewAccount.qml	2013-09-13 19:17:45 +0000
@@ -171,7 +171,7 @@
     }
 
     function toggleNewUser() {
-        if(state == "login") {
+        if(state == "login" || state == "twofactor") {
             switchTo(registerForm)
             state = "register";
             registerForm.nameTextField.focus = true;