Side by Side Diff: src/plugin/PluginClass.cpp
Issue 10948032:
Fix domain-based whitelisting (Closed)
Patch Set:
Created June 17, 2013, 1:50 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« src/plugin/AdblockPlusClient.cpp ('k')
|
src/plugin/PluginClientBase.h » ('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 "PluginClass.h" | 3 #include "PluginClass.h" |
| 4 #include "PluginSettings.h" | 4 #include "PluginSettings.h" |
| 5 #include "PluginSystem.h" | 5 #include "PluginSystem.h" |
| 6 #ifdef SUPPORT_FILTER | 6 #ifdef SUPPORT_FILTER |
| 7 #include "PluginFilter.h" | 7 #include "PluginFilter.h" |
| 8 #endif | 8 #endif |
| 9 #include "PluginMimeFilterClient.h" | 9 #include "PluginMimeFilterClient.h" |
| 10 #include "PluginClient.h" | 10 #include "PluginClient.h" |
| (...skipping 1380 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1391 s_mimeFilter = CPluginClientFactory::GetMimeFilterClientInstance(); | 1391 s_mimeFilter = CPluginClientFactory::GetMimeFilterClientInstance(); |
| 1392 } | 1392 } |
| 1393 else | 1393 else |
| 1394 { | 1394 { |
| 1395 s_mimeFilter = NULL; | 1395 s_mimeFilter = NULL; |
| 1396 | 1396 |
| 1397 CPluginClientFactory::ReleaseMimeFilterClientInstance(); | 1397 CPluginClientFactory::ReleaseMimeFilterClientInstance(); |
| 1398 } | 1398 } |
| 1399 } | 1399 } |
| 1400 s_criticalSectionLocal.Unlock(); | 1400 s_criticalSectionLocal.Unlock(); |
| 1401 | |
| 1402 #ifdef SUPPORT_WHITELIST | |
| 1403 client->ClearWhiteListCache(); | |
| 1404 #endif | |
| 1405 } | 1401 } |
| 1406 break; | 1402 break; |
| 1407 #ifndef ENTERPRISE | 1403 #ifndef ENTERPRISE |
| 1408 case ID_SETTINGS: | 1404 case ID_SETTINGS: |
| 1409 { | 1405 { |
| 1410 url = CString(UserSettingsFileUrl().c_str()); | 1406 url = CString(UserSettingsFileUrl().c_str()); |
| 1411 } | 1407 } |
| 1412 break; | 1408 break; |
| 1413 #endif | 1409 #endif |
| 1414 case ID_INVITEFRIENDS: | 1410 case ID_INVITEFRIENDS: |
| (...skipping 781 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2196 } | 2192 } |
| 2197 } | 2193 } |
| 2198 } | 2194 } |
| 2199 | 2195 |
| 2200 hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT); | 2196 hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT); |
| 2201 } | 2197 } |
| 2202 | 2198 |
| 2203 return hTabWnd; | 2199 return hTabWnd; |
| 2204 | 2200 |
| 2205 } | 2201 } |
| OLD | NEW |
« no previous file with comments
|
« src/plugin/AdblockPlusClient.cpp ('k')
|
src/plugin/PluginClientBase.h » ('j')
|
no next file with comments »
