Unified Diff: Shared/PluginSettings.cpp
Issue 8978054:
Removal of shareware parts (Closed)
Patch Set:
Created Dec. 5, 2012, 7:59 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« Shared/PluginSettings.h ('k')
|
Shared/PluginWbPassThrough.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/PluginSettings.cpp |
| =================================================================== |
| --- a/Shared/PluginSettings.cpp |
| +++ b/Shared/PluginSettings.cpp |
| @@ -360,11 +360,9 @@ |
| { |
| m_properties.clear(); |
| - m_properties[SETTING_PLUGIN_EXPIRED] = "false"; |
| m_properties[SETTING_PLUGIN_VERSION] = IEPLUGIN_VERSION; |
| m_properties[SETTING_LANGUAGE] = "en"; |
| m_properties[SETTING_DICTIONARY_VERSION] = "1"; |
| - m_properties[SETTING_PLUGIN_REGISTRATION] = "false"; |
| } |
| s_criticalSectionLocal.Unlock(); |
| @@ -750,7 +748,7 @@ |
| bool CPluginSettings::IsPluginEnabled() const |
| { |
| - return m_isPluginEnabledTab && !GetBool(SETTING_PLUGIN_EXPIRED, false); |
| + return m_isPluginEnabledTab; |
| } |
| @@ -1452,14 +1450,6 @@ |
| } |
| bool CPluginSettings::GetPluginEnabled() const |
| { |
| - //Display plugin as disabled if limit is passed |
| - CPluginSettings* settings = CPluginSettings::GetInstance(); |
| - if (!settings->GetBool(SETTING_PLUGIN_REGISTRATION, false) && |
| - (settings->GetValue(SETTING_PLUGIN_ADBLOCKCOUNT, 0) >= settings->GetValue(SETTING_PLUGIN_ADBLOCKLIMIT, 0)) && |
| - (settings->GetValue(SETTING_PLUGIN_ADBLOCKLIMIT, 0) > 0)) |
| - { |
| - return false; |
| - } |
| return m_isPluginEnabledTab; |
| } |
« no previous file with comments
|
« Shared/PluginSettings.h ('k')
|
Shared/PluginWbPassThrough.cpp » ('j')
|
no next file with comments »
