From: Christian Kamm <mail@ckamm.de>
Date: Tue, 3 Jan 2017 12:53:13 +0000 (+0100)
Subject: Account: Fix displayName() #5413
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~925
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=084146756bb9637ef32f229281d053394389efc1;p=nextcloud-desktop.git

Account: Fix displayName() #5413

This displayName() seemed to be based on Account::user() which used
to call _credentials->user(). But then we repurposed user() to be
davUser() and this usage wasn't updated to point back to the username
used for the credentials.
---

diff --git a/src/libsync/account.cpp b/src/libsync/account.cpp
index 723aa1671..77f953659 100644
--- a/src/libsync/account.cpp
+++ b/src/libsync/account.cpp
@@ -92,7 +92,7 @@ void Account::setDavUser(const QString &newDavUser)
 
 QString Account::displayName() const
 {
-    QString dn = QString("%1@%2").arg(davUser(), _url.host());
+    QString dn = QString("%1@%2").arg(_credentials->user(), _url.host());
     int port = url().port();
     if (port > 0 && port != 80 && port != 443) {
         dn.append(QLatin1Char(':'));