mirror of
https://github.com/chylex/Nextcloud-Desktop.git
synced 2026-04-05 14:34:16 +02:00
Compare commits
2 Commits
v1.6.2
...
v1.6.2-the
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cfdfd6a860 | ||
|
|
5254c9785c |
@@ -405,7 +405,7 @@ void ShibbolethCredentials::showLoginWindow(Account* account)
|
||||
|
||||
QList<QNetworkCookie> ShibbolethCredentials::accountCookies(Account *account)
|
||||
{
|
||||
return account->networkAccessManager()->cookieJar()->cookiesForUrl(account->url());
|
||||
return account->networkAccessManager()->cookieJar()->cookiesForUrl(account->davUrl());
|
||||
}
|
||||
|
||||
QNetworkCookie ShibbolethCredentials::findShibCookie(Account *account, QList<QNetworkCookie> cookies)
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
#include <QDir>
|
||||
#include <QFileDialog>
|
||||
#include <QUrl>
|
||||
#include <QTimer>
|
||||
#include <QPushButton>
|
||||
#include <QMessageBox>
|
||||
|
||||
@@ -145,9 +146,12 @@ void OwncloudSetupPage::initializePage()
|
||||
if (Theme::instance()->overrideServerUrl().isEmpty()) {
|
||||
_ui.leUrl->setFocus();
|
||||
} else {
|
||||
setVisible(false);
|
||||
setCommitPage(true);
|
||||
validatePage();
|
||||
setVisible(false);
|
||||
// because the wizard will call show on us right after this call, we need to hide in the
|
||||
// next event loop iteration.
|
||||
QTimer::singleShot(0, this, SLOT(hide()));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -161,7 +161,6 @@ void OwncloudWizard::slotCurrentPageChanged( int id )
|
||||
|
||||
if( id == WizardCommon::Page_ServerSetup ) {
|
||||
emit clearPendingRequests();
|
||||
_setupPage->initializePage();
|
||||
}
|
||||
|
||||
if( id == WizardCommon::Page_Result ) {
|
||||
|
||||
Reference in New Issue
Block a user