Unified Diff: Shared/PluginUserSettings.cpp
Issue 9998007:
Initial libadblockplus integration (Closed)
Patch Set: More integration, reflecting latest libadblockplus changes
Created April 9, 2013, 5:48 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« Shared/PluginTabBase.cpp ('k')
|
html/static/js/IESettings.js » ('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/PluginUserSettings.cpp |
| =================================================================== |
| --- a/Shared/PluginUserSettings.cpp |
| +++ b/Shared/PluginUserSettings.cpp |
| @@ -252,11 +252,9 @@ |
| if (VT_BSTR != pDispparams->rgvarg[0].vt) |
| return DISP_E_TYPEMISMATCH; |
| - CComBSTR language = pDispparams->rgvarg[0].bstrVal; |
| + CComBSTR url = pDispparams->rgvarg[0].bstrVal; |
| - settings->SetString(SETTING_LANGUAGE, (BSTR)language); |
| - settings->Write(); |
| - settings->CheckFilterAndDownload(); |
| + settings->SetSubscription((BSTR)url); |
| } |
| else if (s_GetLanguage == method) |
| { |
| @@ -265,10 +263,10 @@ |
| if (pVarResult) |
| { |
| - CString language = settings->GetString(SETTING_LANGUAGE); |
| + CString url = settings->GetSubscription(); |
| pVarResult->vt = VT_BSTR; |
| - pVarResult->bstrVal = SysAllocString(language); |
| + pVarResult->bstrVal = SysAllocString(url); |
| } |
| } |
| else if (s_GetWhitelistDomains == method) |
| @@ -278,6 +276,7 @@ |
| if (pVarResult) |
| { |
| + //TODO: How and where is this stored? |
| TDomainList whiteList = settings->GetWhiteListedDomainList(true); |
| CString sWhiteList; |
| for (TDomainList::const_iterator it = whiteList.begin(); it != whiteList.end(); ++it) |
« no previous file with comments
|
« Shared/PluginTabBase.cpp ('k')
|
html/static/js/IESettings.js » ('j')
|
no next file with comments »
