[Pkg-owncloud-commits] [owncloud-client] 425/470: Shibboleth: Load username from config for UI (#4751)

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 29932004ae3bc7eb938a2cec1aa2dc9890a7d5f9
Author: Markus Goetz <markus at woboq.com>
Date:   Thu Apr 28 14:55:29 2016 +0200

    Shibboleth: Load username from config for UI (#4751)
    
    For https://github.com/owncloud/enterprise/issues/1034
---
 src/gui/creds/shibbolethcredentials.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/gui/creds/shibbolethcredentials.cpp b/src/gui/creds/shibbolethcredentials.cpp
index 536315e..21574dd 100644
--- a/src/gui/creds/shibbolethcredentials.cpp
+++ b/src/gui/creds/shibbolethcredentials.cpp
@@ -67,8 +67,13 @@ void ShibbolethCredentials::setAccount(Account* account)
 {
     AbstractCredentials::setAccount(account);
 
+    // This is for existing saved accounts.
+    if (_user.isEmpty()) {
+        _user = _account->credentialSetting(QLatin1String(userC)).toString();
+    }
+
     // When constructed with a cookie (by the wizard), we usually don't know the
-    // user name yet. Request it now.
+    // user name yet. Request it now from the server.
     if (_ready && _user.isEmpty()) {
         QTimer::singleShot(1234, this, SLOT(slotFetchUser()));
     }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git