Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/desktop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@woboq.com>2016-02-25 13:33:26 +0300
committerOlivier Goffart <ogoffart@woboq.com>2016-02-25 13:33:26 +0300
commit1fafb1325b525970db8bed6a669dc39e5ea757e4 (patch)
treea79a5aa805518e8047ec0a8543363e20a1e71268 /src/gui/accountmanager.cpp
parent8222295ab19fb3497bbff27c3bb18adf4a24dd51 (diff)
Revert "AccountManager: take theURL from the Theme rather than from the config if the theme specify it"
The URL may change from shiboleth to normal authentication method. Also some people were changing the config file manually to test stuff Issue https://github.com/owncloud/enterprise/issues/1113 This reverts commit 7e5d89293d7bd52ac42d026d34a8154fbbdf33bb.
Diffstat (limited to 'src/gui/accountmanager.cpp')
-rw-r--r--src/gui/accountmanager.cpp9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/gui/accountmanager.cpp b/src/gui/accountmanager.cpp
index 590bfb692..0b5eed458 100644
--- a/src/gui/accountmanager.cpp
+++ b/src/gui/accountmanager.cpp
@@ -194,14 +194,7 @@ AccountPtr AccountManager::load(QSettings& settings)
{
auto acc = createAccount();
- QString overrideUrl = Theme::instance()->overrideServerUrl();
- if( !overrideUrl.isEmpty() ) {
- // if there is a overrideUrl, don't even bother reading from the config as all the accounts
- // must use the overrideUrl
- acc->setUrl(overrideUrl);
- } else {
- acc->setUrl(settings.value(QLatin1String(urlC)).toUrl());
- }
+ acc->setUrl(settings.value(QLatin1String(urlC)).toUrl());
// We want to only restore settings for that auth type and the user value
acc->_settingsMap.insert(QLatin1String(userC), settings.value(userC));