Private browsing now makes a temporary cookies, instead of disabling it

all. After private browsing mode is turned off, original cookies are
restored.
remotes/origin/falkon
nowrep 15 years ago
parent 90e8ef01bd
commit 8fccdf0848
  1. 2
      src/app/qupzilla.cpp
  2. 13
      src/cookies/cookiejar.cpp
  3. 3
      src/cookies/cookiejar.h

@ -1129,7 +1129,7 @@ void QupZilla::startPrivate(bool state)
} }
mApp->webSettings()->setAttribute(QWebSettings::PrivateBrowsingEnabled, state); mApp->webSettings()->setAttribute(QWebSettings::PrivateBrowsingEnabled, state);
mApp->history()->setSaving(!state); mApp->history()->setSaving(!state);
mApp->cookieJar()->setAllowCookies(!state); mApp->cookieJar()->turnPrivateJar(state);
emit message(MainApplication::CheckPrivateBrowsing, state); emit message(MainApplication::CheckPrivateBrowsing, state);
} }

@ -25,7 +25,6 @@ CookieJar::CookieJar(QupZilla* mainClass, QObject* parent) :
,p_QupZilla(mainClass) ,p_QupZilla(mainClass)
{ {
loadSettings(); loadSettings();
// activeProfil = mApp->getActiveProfil();
m_activeProfil = mApp->getActiveProfil(); m_activeProfil = mApp->getActiveProfil();
} }
@ -127,3 +126,15 @@ void CookieJar::setAllCookies(const QList<QNetworkCookie> &cookieList)
{ {
QNetworkCookieJar::setAllCookies(cookieList); QNetworkCookieJar::setAllCookies(cookieList);
} }
void CookieJar::turnPrivateJar(bool state)
{
if (state) {
m_tempList = QNetworkCookieJar::allCookies();
QNetworkCookieJar::setAllCookies(QList<QNetworkCookie>());
} else {
QNetworkCookieJar::setAllCookies(m_tempList);
m_tempList.clear();
}
}

@ -39,6 +39,8 @@ public:
void restoreCookies(); void restoreCookies();
void setAllowCookies(bool allow); void setAllowCookies(bool allow);
void turnPrivateJar(bool state);
signals: signals:
public slots: public slots:
@ -51,6 +53,7 @@ private:
bool m_deleteOnClose; bool m_deleteOnClose;
QString m_activeProfil; QString m_activeProfil;
QList<QNetworkCookie> m_tempList;
}; };
#endif // COOKIEJAR_H #endif // COOKIEJAR_H

Loading…
Cancel
Save