mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-24 05:15:40 +03:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Go back if browser in wizard is destroyed before getting a cookie."

Browse source 
This reverts commit da370c8b36.
This commit is contained in:
Krzesimir Nowak 2013-08-05 17:57:32 +02:00
parent f0b284eda7
commit 740d33b378
4 changed files with 0 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/creds/shibboleth/shibbolethwebview.cpp
View file

@ -49,11 +49,4 @@ void ShibbolethWebView::onNewCookiesForUrl (const QList<QNetworkCookie>& cookieL
}
}
void ShibbolethWebView::hideEvent(QHideEvent* event)
{
QWebView::hideEvent(event);
Q_EMIT hidden();
}
} // ns Mirall

4
src/creds/shibboleth/shibbolethwebview.h
View file

@ -30,12 +30,8 @@ class ShibbolethWebView : public QWebView
public:
ShibbolethWebView(const QUrl& url, QWidget* parent = 0);
protected:
void hideEvent(QHideEvent* event);
Q_SIGNALS:
void shibbolethCookieReceived (const QNetworkCookie& cookie);
void hidden();
private Q_SLOTS:
void onNewCookiesForUrl (const QList<QNetworkCookie>& cookieList, const QUrl& url);

15
src/wizard/owncloudshibbolethcredspage.cpp
View file

@ -64,8 +64,6 @@ void OwncloudShibbolethCredsPage::initializePage()
_browser->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
connect(_browser, SIGNAL(shibbolethCookieReceived(QNetworkCookie)),
this, SLOT(onShibbolethCookieReceived(QNetworkCookie)));
connect(_browser, SIGNAL(hidden()),
this, SLOT(browserDestroyed()));
//_ui.contentLayout->insertWidget(0, _browser);
_browser->show();
@ -77,23 +75,10 @@ void OwncloudShibbolethCredsPage::initializePage()
_cookie = QNetworkCookie();
}
void OwncloudShibbolethCredsPage::browserDestroyed()
{
_browser = 0;
QWizard* mainWizard(wizard());
mainWizard->show();
mainWizard->raise();
mainWizard->back();
}
void OwncloudShibbolethCredsPage::disposeBrowser(bool later)
{
if (_browser) {
_browser->hide();
disconnect(_browser, SIGNAL(hidden()),
this, SLOT(browserDestroyed()));
disconnect(_browser, SIGNAL(shibbolethCookieReceived(QNetworkCookie)),
this, SLOT(onShibbolethCookieReceived(QNetworkCookie)));
if (later) {

1
src/wizard/owncloudshibbolethcredspage.h
View file

@ -45,7 +45,6 @@ Q_SIGNALS:
private Q_SLOTS:
void onShibbolethCookieReceived(const QNetworkCookie& cookie);
void browserDestroyed();
private:
enum Stage {