Issue 1104 - Cannot uncheck Disable on website option in tool bar

src/plugin/PluginSettings.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 15 matching lines @@
 #include "PluginMutex.h"
 #include "../shared/Utils.h"
 #include <memory>
 
 
 // IE functions
 #pragma comment(lib, "iepmapi.lib")
 
 #include <knownfolders.h>
 
-namespace
-{
-  std::wstring CreateDomainWhitelistingFilter(const CString& domain)
-  {
-    return L"@@||" + ToWstring(domain) + L"^$document";
-  }
-}
-
 class TSettings
 {
   DWORD processorId;
 
   char sPluginId[44];
 };
 
 class CPluginSettingsWhitelistLock : public CPluginMutex
 {
 public:
@@ skipping 140 matching lines @@
       s_criticalSectionLocal.Unlock();
     }
     else
     {
       isRead = false;
     }
 
     return isRead;
 }
 
-void CPluginSettings::AddWhiteListedDomain(const CString& domain)
+void CPluginSettings::AddWhiteListedDomain(const std::wstring& url)
 {
-  DEBUG_SETTINGS("SettingsWhitelist::AddWhiteListedDomain domain:" + domain)
-  CPluginClient::GetInstance()->AddFilter(CreateDomainWhitelistingFilter(domain));
+  DEBUG_SETTINGS("SettingsWhitelist::AddWhiteListedDomain domain:" + ToCString(url))
+  CPluginClient::GetInstance()->AddWhiteListedDomain(url);
 }
 
-void CPluginSettings::RemoveWhiteListedDomain(const CString& domain)
+void CPluginSettings::RemoveWhiteListedDomain(const std::wstring& url)
 {
-  DEBUG_SETTINGS("SettingsWhitelist::RemoveWhiteListedDomain domain:" + domain)
-  CPluginClient::GetInstance()->RemoveFilter(CreateDomainWhitelistingFilter(domain));
+  DEBUG_SETTINGS("SettingsWhitelist::RemoveWhiteListedDomain domain:" + ToCString(url))
+  CPluginClient::GetInstance()->RemoveWhiteListedDomain(url);
 }
 
 int CPluginSettings::GetWhiteListedDomainCount() const
 {
   int count = 0;
 
   s_criticalSectionLocal.Lock();
   {
     count = (int)m_whitelistedDomains.size();
   }
@@ skipping 58 matching lines @@
 
 CString CPluginSettings::GetAppLocale()
 {
   return ToCString(GetBrowserLanguage());
 }
 
 CString CPluginSettings::GetDocumentationLink()
 {
   return CString(CPluginClient::GetInstance()->GetDocumentationLink().c_str());
 }