[polari/wip/fmuellner/3-24-1-candidates: 7/10] app: Use 'username' parameter to restore account name

[Florian Müllner <fmuellner src gnome org>]

commit 0dcdf28749cf0ce11676c3a0434ec1c2046faecf
Author: Florian Müllner <fmuellner gnome org>
Date:   Thu Mar 23 18:33:11 2017 +0100

    app: Use 'username' parameter to restore account name

 src/application.js |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)
---
diff --git a/src/application.js b/src/application.js
index cf1faa8..9eb4c62 100644
--- a/src/application.js
+++ b/src/application.js
@@ -437,7 +437,6 @@ const Application = new Lang.Class({
 
         data = {
             retry: 0,
-            originalAccountName: accountName,
             alternateServers: accountServers.filter(s => s.address != server ||
                                                          s.port != port)
         };
@@ -446,14 +445,10 @@ const Application = new Lang.Class({
     },
 
     _restoreAccountName: function(account) {
-        let data = this._retryData.get(account.object_path);
-        if (!data || !data.retry || !data.originalAccountName)
-            return;
-
-        let params = { account: new GLib.Variant('s', data.originalAccountName) };
+        let storedParams = Connections.getAccountParams(account);
+        let params = { account: new GLib.Variant('s', storedParams.username) };
         let asv = new GLib.Variant('a{sv}', params);
         account.update_parameters_vardict_async(asv, [], null);
-        delete data.originalAccountName;
     },
 
     _retryWithParams: function(account, params) {