diff --git a/src/lib/cookies/cookiejar.cpp b/src/lib/cookies/cookiejar.cpp
index f58751120..eefef89c1 100644
--- a/src/lib/cookies/cookiejar.cpp
+++ b/src/lib/cookies/cookiejar.cpp
@@ -49,7 +49,7 @@ void CookieJar::loadSettings()
Settings settings;
settings.beginGroup("Cookie-Settings");
m_allowCookies = settings.value("allowCookies", true).toBool();
- m_blockThirdParty = settings.value("allowCookiesFromVisitedDomainOnly", 1).toInt();
+ m_allowThirdParty = settings.value("allowThirdPartyCookies", 0).toInt();
m_filterTrackingCookie = settings.value("filterTrackingCookie", false).toBool();
m_deleteOnClose = settings.value("deleteCookiesOnClose", false).toBool();
m_whitelist = settings.value("whitelist", QStringList()).toStringList();
@@ -57,7 +57,7 @@ void CookieJar::loadSettings()
settings.endGroup();
#if QTWEBKIT_FROM_2_3
- switch (m_blockThirdParty) {
+ switch (m_allowThirdParty) {
case 0:
QWebSettings::globalSettings()->setThirdPartyCookiePolicy(QWebSettings::AlwaysAllowThirdPartyCookies);
break;
@@ -220,7 +220,7 @@ bool CookieJar::rejectCookie(const QString &domain, const QNetworkCookie &cookie
// This feature is now natively in QtWebKit 2.3
#if QTWEBKIT_TO_2_3
- if (m_blockThirdParty) {
+ if (m_allowThirdParty) {
bool result = matchDomain(cookieDomain, domain);
if (!result) {
#ifdef COOKIE_DEBUG
diff --git a/src/lib/cookies/cookiejar.h b/src/lib/cookies/cookiejar.h
index 2aa6d3db5..db63e010a 100644
--- a/src/lib/cookies/cookiejar.h
+++ b/src/lib/cookies/cookiejar.h
@@ -57,7 +57,7 @@ private:
bool m_allowCookies;
bool m_filterTrackingCookie;
- int m_blockThirdParty;
+ int m_allowThirdParty;
bool m_deleteOnClose;
QStringList m_whitelist;
diff --git a/src/lib/cookies/cookiemanager.cpp b/src/lib/cookies/cookiemanager.cpp
index c4cfaca39..9547037fd 100644
--- a/src/lib/cookies/cookiemanager.cpp
+++ b/src/lib/cookies/cookiemanager.cpp
@@ -71,7 +71,7 @@ CookieManager::CookieManager(QWidget* parent)
ui->deleteCookiesOnClose->setEnabled(false);
}
ui->deleteCookiesOnClose->setChecked(settings.value("deleteCookiesOnClose", false).toBool());
- ui->filter3rdParty->setCurrentIndex(settings.value("allowCookiesFromVisitedDomainOnly", 1).toInt());
+ ui->allowThirdPartyCookies->setCurrentIndex(settings.value("allowThirdPartyCookies", 0).toInt());
ui->filterTracking->setChecked(settings.value("filterTrackingCookie", false).toBool());
settings.endGroup();
@@ -329,7 +329,7 @@ void CookieManager::closeEvent(QCloseEvent* e)
settings.beginGroup("Cookie-Settings");
settings.setValue("allowCookies", ui->saveCookies->isChecked());
settings.setValue("deleteCookiesOnClose", ui->deleteCookiesOnClose->isChecked());
- settings.setValue("allowCookiesFromVisitedDomainOnly", ui->filter3rdParty->currentIndex());
+ settings.setValue("allowThirdPartyCookies", ui->allowThirdPartyCookies->currentIndex());
settings.setValue("filterTrackingCookie", ui->filterTracking->isChecked());
settings.setValue("whitelist", whitelist);
settings.setValue("blacklist", blacklist);
diff --git a/src/lib/cookies/cookiemanager.ui b/src/lib/cookies/cookiemanager.ui
index 7d52c2550..e6a669787 100644
--- a/src/lib/cookies/cookiemanager.ui
+++ b/src/lib/cookies/cookiemanager.ui
@@ -433,7 +433,7 @@
-
- Filter 3rd party cookies:
+ Allow 3rd party cookies:
@@ -460,7 +460,7 @@
-
- <b>Warning:</b> Filter 3rd party and tracking cookies options can lead to deny some cookies from sites. If you have problems with cookies, try to disable these options first!
+ <b>Warning:</b> Allow 3rd party and tracking cookies options can lead to deny some cookies from sites. If you have problems with cookies, try to disable these options first!
true
@@ -475,7 +475,7 @@
-
-
+
<p><b>Always:</b> Allow third-party resources to set and retrieve cookies.</p>
<p><b>Never:</b> Never allow third-party resources to set and retrieve cookies.</p>
diff --git a/translations/empty.ts b/translations/empty.ts
index 0fe35a648..55a47455b 100644
--- a/translations/empty.ts
+++ b/translations/empty.ts
@@ -863,11 +863,6 @@ Please install latest version of QupZilla.
-
-
-
-
-
@@ -1081,73 +1076,73 @@ Please install latest version of QupZilla.
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -1156,12 +1151,12 @@ Are you sure to close this window?
-
+
-
+
@@ -1471,8 +1466,8 @@ Are you sure to close this window?
-
-
+
+
@@ -1498,12 +1493,12 @@ Are you sure to close this window?
-
-
+
+
@@ -1514,7 +1509,7 @@ Are you sure to close this window?
-
+
@@ -1577,7 +1572,7 @@ Are you sure to close this window?
-
+
@@ -1587,7 +1582,7 @@ Are you sure to close this window?
-
+
@@ -1618,42 +1613,42 @@ Are you sure to close this window?
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -3378,7 +3373,7 @@ Are you sure to close this window?
-
+
@@ -4332,68 +4327,68 @@ Are you sure to close this window?
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
@@ -4421,42 +4416,42 @@ Are you sure to close this window?
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -4586,7 +4581,7 @@ Are you sure to close this window?
-
+
@@ -4597,13 +4592,13 @@ Are you sure to close this window?
-
+
-
+
@@ -4623,316 +4618,316 @@ Are you sure to close this window?
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -5817,17 +5812,17 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla
SpeedDial
-
+
-
+
-
+