Merge lp:~mikemc/ubuntuone-credentials/delete-on-cancel into lp:ubuntuone-credentials

[Mike McCracken]

- Do not leave an empty UOA account in the DB if the user clicks cancel.

- Do not leave an empty UOA account in the DB if the user clicks cancel.

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.

- Click "cancel"

IF necessary, click "accounts" again to get back to the accounts list (this is a UOA bug #1223963 )

There should be no account in the list.

[dobey (dobey)]

review: Approve

[Roberto Alsina (ralsina)]

review: Approve

=== modified file 'online-accounts-provider/ButtonRow.qml'
--- online-accounts-provider/ButtonRow.qml	2013-09-12 14:59:06 +0000
+++ online-accounts-provider/ButtonRow.qml	2013-09-13 18:51:26 +0000
@@ -12,7 +12,7 @@
         height: parent.height
         width: (parent.width / 2) - 0.5 * parent.spacing
         onClicked: {
-            finished();
+            userCancelled();
         }
     }
     Button {

=== 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 18:51:26 +0000
@@ -184,6 +184,13 @@
         }
     }
 
+    function userCancelled() {
+        console.debug("Removing account ID: " + account.accountId);
+        account.removed.connect(finished);
+        account.remove(Account.RemoveCredentials);
+        resetUI();
+    }
+
     /* processForm uses a timer to delay calling u1credservice, which can
        take a while, to ensure that the loadingOverlay is shown
        immediately.