From: Claudio Cambra Date: Wed, 23 Aug 2023 01:26:31 +0000 (+0800) Subject: Do not include theme header in account header X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~92^2^2~30^2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=01cb5d7e222a7b783d2540aa21437825c0c0d1e8;p=nextcloud-desktop.git Do not include theme header in account header Signed-off-by: Claudio Cambra --- diff --git a/src/libsync/account.cpp b/src/libsync/account.cpp index da3a80a29..872acee50 100644 --- a/src/libsync/account.cpp +++ b/src/libsync/account.cpp @@ -22,6 +22,7 @@ #include "creds/abstractcredentials.h" #include "networkjobs.h" #include "pushnotifications.h" +#include "theme.h" #include "version.h" #include "deletejob.h" @@ -70,6 +71,7 @@ const char app_password[] = "_app-password"; Account::Account(QObject *parent) : QObject(parent) , _capabilities(QVariantMap()) + , _serverColor(Theme::defaultColor()) { qRegisterMetaType("AccountPtr"); qRegisterMetaType("Account*"); diff --git a/src/libsync/account.h b/src/libsync/account.h index 1c44b7144..4cad863cf 100644 --- a/src/libsync/account.h +++ b/src/libsync/account.h @@ -35,7 +35,7 @@ #include "clientsideencryption.h" #include "common/utility.h" #include "syncfileitem.h" -#include "theme.h" + #include class QSettings; @@ -409,7 +409,7 @@ private: QSslConfiguration _sslConfiguration; Capabilities _capabilities; QString _serverVersion; - QColor _serverColor = Theme::defaultColor(); + QColor _serverColor; QColor _serverTextColor = QColorConstants::White; bool _skipE2eeMetadataChecksumValidation = false; QScopedPointer _sslErrorHandler;