Unified Diff: Shared/PluginFilter.cpp
Issue 8949229:
Removal of all user tracking and shareware parts (Closed)
Patch Set:
Created Dec. 6, 2012, 4:38 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« AdBlocker/SimpleAdblockDomTraverser.cpp ('K')
|
« Shared/PluginConfiguration.cpp ('k')
|
Shared/PluginHttpRequest.cpp » ('j')
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: Shared/PluginFilter.cpp |
| =================================================================== |
| --- a/Shared/PluginFilter.cpp |
| +++ b/Shared/PluginFilter.cpp |
| @@ -1788,19 +1788,6 @@ |
| CPluginSettings* settings = CPluginSettings::GetInstance(); |
| - |
| - if (!settings->GetBool(SETTING_PLUGIN_REGISTRATION, false)) |
| - { |
| - //is the limit exceeded? |
| - if ((settings->GetValue(SETTING_PLUGIN_ADBLOCKCOUNT, 0) >= settings->GetValue(SETTING_PLUGIN_ADBLOCKLIMIT, 0)) |
| - && (settings->GetValue(SETTING_PLUGIN_ADBLOCKLIMIT, 0) > 0)) |
| - { |
| - return false; |
| - } |
| - } |
| - |
| - |
| - |
| CString type; |
| if (addDebug) |
| { |
| @@ -1839,20 +1826,6 @@ |
| DEBUG_FILTER("Filter::ShouldBlock " + type + " NO src:" + src) |
| } |
| - |
| - if (blockFilter) |
| - { |
| - //is plugin registered |
| - if (!settings->GetBool(SETTING_PLUGIN_REGISTRATION, false)) |
| - { |
| - //is the limit exceeded? When the upgrade dialog is displayed adblockcount is set to 1000000 |
| - if ((settings->GetValue(SETTING_PLUGIN_ADBLOCKCOUNT, 0) >= settings->GetValue(SETTING_PLUGIN_ADBLOCKLIMIT, 0)) |
| - && (settings->GetValue(SETTING_PLUGIN_ADBLOCKLIMIT, 0) > 0)) |
| - { |
| - return false; |
| - } |
| - } |
| - } |
| return blockFilter ? true : false; |
| } |
« AdBlocker/SimpleAdblockDomTraverser.cpp ('K')
|
« Shared/PluginConfiguration.cpp ('k')
|
Shared/PluginHttpRequest.cpp » ('j')
|
no next file with comments »
