Support Acceptable Ads

src/plugin/PluginSettings.cpp

 #include "PluginStdAfx.h"
 
 #include <Wbemidl.h>
 #include <time.h>
 #include "PluginSettings.h"
 #include "PluginClient.h"
 #include "PluginSystem.h"
 #ifdef SUPPORT_FILTER
 #include "PluginFilter.h"
 #endif
@@ skipping 298 matching lines @@
 
   return m_WindowsBuildNumber;
 }
 
 void CPluginSettings::SetSubscription(const std::wstring& url)
 {
   CPluginClient::GetInstance()->SetSubscription(url);
   RefreshWhitelist();
 }
 
 CString CPluginSettings::GetSubscription()

[Eric, 2014/06/25 14:34:15]

FYI. The return type of this function has changed to std::wstring as part of the
ATL rewrite.

 {
   std::vector<SubscriptionDescription> subscriptions = CPluginClient::GetInstance()->GetListedSubscriptions();
-  if (subscriptions.size() > 0)
-    return CString(subscriptions.front().url.c_str());
-  else
-    return CString(L"");
+  std::wstring aaUrl = CPluginClient::GetInstance()->GetPref(L"subscriptions_exceptionsurl", L"");
+
+  for (std::vector<SubscriptionDescription>::iterator subscription = subscriptions.begin(); subscription < subscriptions.end(); subscription ++)

[Felix Dahlke, 2014/06/30 17:24:04]

"<" -> "!=" and "subscription ++" -> "subscription++" again.

+  {
+    if (subscription->url != aaUrl)
+    {
+      return CString(subscription->url.c_str());
+    }
+  }
+  return CString(L"");
 }
 
 CString CPluginSettings::GetAppLocale()
 {
   return CPluginSystem::GetInstance()->GetBrowserLanguage();
 }
 
 CString CPluginSettings::GetDocumentationLink()
 {
   return CString(CPluginClient::GetInstance()->GetDocumentationLink().c_str());
 }
 
 
 
 #endif // SUPPORT_WHITELIST