diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2014-08-30 19:57:58 +0400 |
|---|---|---|
| committer | Olivier Goffart <ogoffart@woboq.com> | 2014-08-30 19:57:58 +0400 |
| commit | 291231c5618d0c19c419b803e76a373fdd41fc51 (patch) | |
| tree | 9358fa9d32ea09d37c6ba31ed1a99f729894d926 /src/creds | |
| parent | 68792ee9db9c94e51ac1d8e41e4ff52bdb920012 (diff) | |
| parent | 753aa9132e9c818a69aa4f18014beeee9c0ffa15 (diff) | |
Merge missing commits from 1.6.2-themefix into 1.7
Conflicts:
VERSION.cmake
Diffstat (limited to 'src/creds')
| -rw-r--r-- | src/creds/shibbolethcredentials.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/creds/shibbolethcredentials.cpp b/src/creds/shibbolethcredentials.cpp index 394f1a77b..ffbac8185 100644 --- a/src/creds/shibbolethcredentials.cpp +++ b/src/creds/shibbolethcredentials.cpp @@ -385,7 +385,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) |