[polari/wip/fmuellner/3-24-1-candidates: 6/10] connections: Use 'username' over 'account' parameter



commit 2993bc7186844efacb43e8fd828111afe761753c
Author: Florian Müllner <fmuellner gnome org>
Date:   Thu Mar 23 18:22:09 2017 +0100

    connections: Use 'username' over 'account' parameter

 src/connections.js |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/src/connections.js b/src/connections.js
index 689e596..b2bb442 100644
--- a/src/connections.js
+++ b/src/connections.js
@@ -23,6 +23,7 @@ function getAccountParams(account) {
     for (let p in params)
         params[p] = params[p].deep_unpack();
 
+    params['username'] = params['username'] || params['account'];
     params['use-ssl'] = !!params['use-ssl'];
     params['port'] = params['port'] || params['use-ssl'] ? DEFAULT_SSL_PORT
                                                          : DEFAULT_PORT;
@@ -319,7 +320,7 @@ const ConnectionDetails = new Lang.Class({
         let defaultPort = this._savedSSL ? DEFAULT_SSL_PORT : DEFAULT_PORT;
         this._savedServer = params.server || '';
         let port = params.port;
-        this._savedNick = params.account || '';
+        this._savedNick = params.username || '';
         this._savedRealname = params.fullname || '';
 
         if (port != defaultPort)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]