From b0dbb49ca84a42f701f75270334f3e1714de9074 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <ogoffart@woboq.com>
Date: Mon, 26 Jan 2015 15:56:57 +0100
Subject: [PATCH] Shib: fix broken signal/slot connections

---
 src/gui/wizard/owncloudshibbolethcredspage.cpp     | 6 +++---
 src/gui/wizard/owncloudshibbolethcredspage.h       | 2 +-
 src/libsync/creds/shibboleth/shibbolethwebview.cpp | 2 +-
 src/libsync/creds/shibboleth/shibbolethwebview.h   | 2 +-
 src/libsync/creds/shibbolethcredentials.cpp        | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/gui/wizard/owncloudshibbolethcredspage.cpp b/src/gui/wizard/owncloudshibbolethcredspage.cpp
index 398148e2a2a..22401bbc55a 100644
--- a/src/gui/wizard/owncloudshibbolethcredspage.cpp
+++ b/src/gui/wizard/owncloudshibbolethcredspage.cpp
@@ -47,8 +47,8 @@ void OwncloudShibbolethCredsPage::setupBrowser()
     qnam->setCookieJar(jar);
 
     _browser = new ShibbolethWebView(account);
-    connect(_browser, SIGNAL(shibbolethCookieReceived(const QNetworkCookie&, AccountPtr)),
-            this, SLOT(slotShibbolethCookieReceived(const QNetworkCookie&, AccountPtr)), Qt::QueuedConnection);
+    connect(_browser, SIGNAL(shibbolethCookieReceived(const QNetworkCookie&)),
+            this, SLOT(slotShibbolethCookieReceived(const QNetworkCookie&)), Qt::QueuedConnection);
     connect(_browser, SIGNAL(rejected()),
             this, SLOT(slotBrowserRejected()));
 
@@ -95,7 +95,7 @@ AbstractCredentials* OwncloudShibbolethCredsPage::getCredentials() const
     return new ShibbolethCredentials(_cookie);
 }
 
-void OwncloudShibbolethCredsPage::slotShibbolethCookieReceived(const QNetworkCookie &cookie, AccountPtr)
+void OwncloudShibbolethCredsPage::slotShibbolethCookieReceived(const QNetworkCookie &cookie)
 {
     _cookie = cookie;
     emit connectToOCUrl(field("OCUrl").toString().simplified());
diff --git a/src/gui/wizard/owncloudshibbolethcredspage.h b/src/gui/wizard/owncloudshibbolethcredspage.h
index 257507275a5..c5a7b491689 100644
--- a/src/gui/wizard/owncloudshibbolethcredspage.h
+++ b/src/gui/wizard/owncloudshibbolethcredspage.h
@@ -46,7 +46,7 @@ public Q_SLOTS:
   void setVisible(bool visible) Q_DECL_OVERRIDE;
 
 private Q_SLOTS:
-  void slotShibbolethCookieReceived(const QNetworkCookie&, AccountPtr);
+  void slotShibbolethCookieReceived(const QNetworkCookie&);
   void slotBrowserRejected();
 
 private:
diff --git a/src/libsync/creds/shibboleth/shibbolethwebview.cpp b/src/libsync/creds/shibboleth/shibbolethwebview.cpp
index 9090d27b6f9..3c914bd407a 100644
--- a/src/libsync/creds/shibboleth/shibbolethwebview.cpp
+++ b/src/libsync/creds/shibboleth/shibbolethwebview.cpp
@@ -71,7 +71,7 @@ void ShibbolethWebView::onNewCookiesForUrl (const QList<QNetworkCookie>& cookieL
     if (url.host() == _account->url().host()) {
         QNetworkCookie shibCookie = ShibbolethCredentials::findShibCookie(_account.data(), cookieList);
         if (shibCookie != QNetworkCookie()) {
-            Q_EMIT shibbolethCookieReceived(shibCookie, _account);
+            Q_EMIT shibbolethCookieReceived(shibCookie);
             accept();
             close();
         }
diff --git a/src/libsync/creds/shibboleth/shibbolethwebview.h b/src/libsync/creds/shibboleth/shibbolethwebview.h
index 6667ac7b906..f8b79ceae61 100644
--- a/src/libsync/creds/shibboleth/shibbolethwebview.h
+++ b/src/libsync/creds/shibboleth/shibbolethwebview.h
@@ -40,7 +40,7 @@ class OWNCLOUDSYNC_EXPORT ShibbolethWebView : public QWebView
   void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE;
 
 Q_SIGNALS:
-  void shibbolethCookieReceived(const QNetworkCookie &cookie, AccountPtr account);
+  void shibbolethCookieReceived(const QNetworkCookie &cookie);
   void rejected();
 
 private Q_SLOTS:
diff --git a/src/libsync/creds/shibbolethcredentials.cpp b/src/libsync/creds/shibbolethcredentials.cpp
index ee895f9021b..df7a7c21a8b 100644
--- a/src/libsync/creds/shibbolethcredentials.cpp
+++ b/src/libsync/creds/shibbolethcredentials.cpp
@@ -377,8 +377,8 @@ void ShibbolethCredentials::showLoginWindow()
     jar->clearSessionCookies();
 
     _browser = new ShibbolethWebView(_account->sharedFromThis());
-    connect(_browser, SIGNAL(shibbolethCookieReceived(QNetworkCookie, AccountPtr)),
-            this, SLOT(onShibbolethCookieReceived(QNetworkCookie, AccountPtr)), Qt::QueuedConnection);
+    connect(_browser, SIGNAL(shibbolethCookieReceived(QNetworkCookie)),
+            this, SLOT(onShibbolethCookieReceived(QNetworkCookie)), Qt::QueuedConnection);
     connect(_browser, SIGNAL(rejected()), this, SLOT(slotBrowserRejected()));
 
     _browser->show();