Side by Side Diff: src/plugin/PluginTabBase.cpp
Issue 10948032:
Fix domain-based whitelisting (Closed)
Patch Set:
Created June 14, 2013, 2:44 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« src/plugin/PluginSettings.cpp ('K')
|
« src/plugin/PluginSettings.cpp ('k')
|
src/plugin/PluginUserSettings.cpp » ('j')
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 #include "PluginStdAfx.h" | 1 #include "PluginStdAfx.h" |
| 2 | 2 |
| 3 #include "PluginClient.h" | 3 #include "PluginClient.h" |
| 4 #include "PluginSettings.h" | 4 #include "PluginSettings.h" |
| 5 #ifdef SUPPORT_CONFIG | 5 #ifdef SUPPORT_CONFIG |
| 6 #include "PluginConfig.h" | 6 #include "PluginConfig.h" |
| 7 #endif | 7 #endif |
| 8 #include "PluginTab.h" | 8 #include "PluginTab.h" |
| 9 #include "PluginDomTraverser.h" | 9 #include "PluginDomTraverser.h" |
| 10 #include "PluginClass.h" | 10 #include "PluginClass.h" |
| (...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 392 } | 392 } |
| 393 | 393 |
| 394 isChanged = tab->OnUpdateConfig() ? true : isChanged; | 394 isChanged = tab->OnUpdateConfig() ? true : isChanged; |
| 395 | 395 |
| 396 #ifdef SUPPORT_WHITELIST | 396 #ifdef SUPPORT_WHITELIST |
| 397 int newWhitelistVersion = settings->GetTabVersion(SETTING_TAB_WHITELIST_ VERSION); | 397 int newWhitelistVersion = settings->GetTabVersion(SETTING_TAB_WHITELIST_ VERSION); |
| 398 if (s_whitelistVersion != newWhitelistVersion) | 398 if (s_whitelistVersion != newWhitelistVersion) |
| 399 { | 399 { |
| 400 s_whitelistVersion = newWhitelistVersion; | 400 s_whitelistVersion = newWhitelistVersion; |
| 401 settings->RefreshWhitelist(); | 401 settings->RefreshWhitelist(); |
| 402 client->ClearWhiteListCache(); | |
| 403 isChanged = true; | 402 isChanged = true; |
| 404 } | 403 } |
| 405 #endif // SUPPORT_WHITELIST | 404 #endif // SUPPORT_WHITELIST |
| 406 | 405 |
| 407 #ifdef SUPPORT_FILTER | 406 #ifdef SUPPORT_FILTER |
| 408 int newFilterVersion = settings->GetTabVersion(SETTING_TAB_FILTER_VERSIO N); | 407 int newFilterVersion = settings->GetTabVersion(SETTING_TAB_FILTER_VERSIO N); |
| 409 if (s_filterVersion != newFilterVersion) | 408 if (s_filterVersion != newFilterVersion) |
| 410 { | 409 { |
| 411 s_filterVersion = newFilterVersion; | 410 s_filterVersion = newFilterVersion; |
| 412 isChanged = true; | 411 isChanged = true; |
| (...skipping 23 matching lines...) Expand all Loading... | |
| 436 | 435 |
| 437 // Non-hanging sleep | 436 // Non-hanging sleep |
| 438 Sleep(50); | 437 Sleep(50); |
| 439 } | 438 } |
| 440 | 439 |
| 441 tabLoopIteration++; | 440 tabLoopIteration++; |
| 442 } | 441 } |
| 443 | 442 |
| 444 return 0; | 443 return 0; |
| 445 } | 444 } |
| OLD | NEW |
« src/plugin/PluginSettings.cpp ('K')
|
« src/plugin/PluginSettings.cpp ('k')
|
src/plugin/PluginUserSettings.cpp » ('j')
|
no next file with comments »
