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

src/plugin/AdblockPlusClient.cpp

Index: src/plugin/AdblockPlusClient.cpp
diff --git a/src/plugin/AdblockPlusClient.cpp b/src/plugin/AdblockPlusClient.cpp
index cafca5124d3fc6c21a24f275cf3eeacb96f28413..8020f546c4087235b494dfbecf8f6ed16c129594 100644
--- a/src/plugin/AdblockPlusClient.cpp
+++ b/src/plugin/AdblockPlusClient.cpp
@@ -259,21 +259,21 @@ bool CAdblockPlusClient::IsElementHidden(const std::wstring& tag, IHTMLElement*
   return isHidden;
 }
 
-bool CAdblockPlusClient::IsWhitelistedUrl(const std::wstring& url)
+CAdblockPlusClient::ExceptionFilter CAdblockPlusClient::IsWhitelistedUrl(const std::wstring& url)
 {
   DEBUG_GENERAL((L"IsWhitelistedUrl: " + url + L" start").c_str());
+  ExceptionFilter exceptionFilter;
   Communication::OutputBuffer request;
   request << Communication::PROC_IS_WHITELISTED_URL << ToUtf8String(url);
 
   Communication::InputBuffer response;
   if (!CallEngine(request, response)) 
-    return false;
+    return exceptionFilter;
 
-  bool isWhitelisted;
-  response >> isWhitelisted;
+  response >> exceptionFilter.filterText;
 
   DEBUG_GENERAL((L"IsWhitelistedUrl: " + url + L" end").c_str());
-  return isWhitelisted;
+  return exceptionFilter;
 }
 
 bool CAdblockPlusClient::IsElemhideWhitelistedOnDomain(const std::wstring& url)
@@ -406,8 +406,13 @@ void CAdblockPlusClient::AddFilter(const std::wstring& text)
 
 void CAdblockPlusClient::RemoveFilter(const std::wstring& text)
 {
+  RemoveFilter(ToUtf8String(text));
+}
+
+void CAdblockPlusClient::RemoveFilter(const std::string& text)
+{
   Communication::OutputBuffer request;
-  request << Communication::PROC_REMOVE_FILTER << ToUtf8String(text);
+  request << Communication::PROC_REMOVE_FILTER << text;
   CallEngine(request);
 }