[Pkg-owncloud-commits] [owncloud-client] 243/498: Password dialog: Include account name.

[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 7053f76d1e15ade6bb194331542a59ee4e7c48a4
Author: Christian Kamm <kamm at incasoftware.de>
Date:   Fri Jul 3 11:39:44 2015 +0200

    Password dialog: Include account name.
    
    Users with accounts on multiple servers could easily use the same
    username on both servers. The password dialog did not tell users
    what server the password is for. I added the account name to the
    dialog.
---
 src/gui/creds/httpcredentialsgui.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/gui/creds/httpcredentialsgui.cpp b/src/gui/creds/httpcredentialsgui.cpp
index ca28868..1d6dfd7 100644
--- a/src/gui/creds/httpcredentialsgui.cpp
+++ b/src/gui/creds/httpcredentialsgui.cpp
@@ -16,6 +16,7 @@
 #include <QInputDialog>
 #include "creds/httpcredentialsgui.h"
 #include "theme.h"
+#include "account.h"
 
 using namespace QKeychain;
 
@@ -26,8 +27,8 @@ namespace OCC
 {
     if (ok) {
         QString str = QInputDialog::getText(0, tr("Enter Password"),
-                                     tr("Please enter %1 password for user '%2':")
-                                     .arg(Theme::instance()->appNameGUI(), _user),
+                                     tr("Please enter %1 password:\n\nUser: %2\nAccount: %3\n")
+                                     .arg(Theme::instance()->appNameGUI(), _user, _account->displayName()),
                                      QLineEdit::Password, _previousPassword, ok);
         return str;
     } else {

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