Compile subscriptions.xml into the libadblockplus build and make itusable

src/FilterEngine.cpp

 #include <algorithm>
 #include <cctype>
 #include <functional>
 
 #include <AdblockPlus.h>
 
 using namespace AdblockPlus;
 
 #if !FILTER_ENGINE_STUBS
 extern const char* jsSources[];
@@ skipping 311 matching lines @@
   knownSubscriptions[url] = result;
   return result;
 #else
   JsValuePtr func = jsEngine->Evaluate("API.getSubscriptionFromUrl");
   JsValueList params;
   params.push_back(jsEngine->NewValue(url));
   return SubscriptionPtr(new Subscription(func->Call(params)));
 #endif
 }
 
-const std::vector<FilterPtr> FilterEngine::GetListedFilters() const
+std::vector<FilterPtr> FilterEngine::GetListedFilters() const
 {
 #if FILTER_ENGINE_STUBS
   return listedFilters;
 #else
   JsValuePtr func = jsEngine->Evaluate("API.getListedFilters");
   JsValueList values = func->Call()->AsList();
   std::vector<FilterPtr> result;
   for (JsValueList::iterator it = values.begin(); it != values.end(); it++)
     result.push_back(FilterPtr(new Filter(*it)));
   return result;
 #endif
 }
 
-const std::vector<SubscriptionPtr> FilterEngine::GetListedSubscriptions() const
+std::vector<SubscriptionPtr> FilterEngine::GetListedSubscriptions() const
 {
 #if FILTER_ENGINE_STUBS
   return listedSubscriptions;
 #else
   JsValuePtr func = jsEngine->Evaluate("API.getListedSubscriptions");
   JsValueList values = func->Call()->AsList();
   std::vector<SubscriptionPtr> result;
   for (JsValueList::iterator it = values.begin(); it != values.end(); it++)
     result.push_back(SubscriptionPtr(new Subscription(*it)));
   return result;
 #endif
 }
 
-void FilterEngine::FetchAvailableSubscriptions(SubscriptionsCallback callback)
+std::vector<SubscriptionPtr> FilterEngine::FetchAvailableSubscriptions() const
 {
 #if FILTER_ENGINE_STUBS

[Felix Dahlke, 2013/04/30 08:59:17]

What's with this diff? FILTER_ENGINE_STUBS has been gone for a while.

[Wladimir Palant, 2013/04/30 09:35:49]

This diff is rather old as well, check the issue date.

   std::vector<SubscriptionPtr> availableSubscriptions;
 
   SubscriptionPtr subscription1 = GetSubscription("https://easylist-downloads.adblockplus.org/easylist.txt");
   subscription1->SetProperty("title", "EasyList");
   availableSubscriptions.push_back(subscription1);
 
   SubscriptionPtr subscription2 = GetSubscription("https://easylist-downloads.adblockplus.org/easylistgermany+easylist.txt");
   subscription2->SetProperty("title", "EasyList Germany+EasyList");
   availableSubscriptions.push_back(subscription2);
 
   callback(availableSubscriptions);
 #else
-  // TODO!
+  JsValuePtr func = jsEngine->Evaluate("API.getRecommendedSubscriptions");
+  JsValueList values = func->Call()->AsList();
+  std::vector<SubscriptionPtr> result;
+  for (JsValueList::iterator it = values.begin(); it != values.end(); it++)
+    result.push_back(SubscriptionPtr(new Subscription(*it)));
+  return result;
 #endif
 }
 
 AdblockPlus::FilterPtr FilterEngine::Matches(const std::string& url,
     const std::string& contentType,
     const std::string& documentUrl)
 {
 #if FILTER_ENGINE_STUBS
   //For test on http://simple-adblock.com/faq/testing-your-adblocker/
   if (url.find("adbanner.gif") != std::string::npos)
@@ skipping 30 matching lines @@
   JsValuePtr func = jsEngine->Evaluate("API.getElementHidingSelectors");
   JsValueList params;
   params.push_back(jsEngine->NewValue(domain));
   JsValueList result = func->Call(params)->AsList();
   std::vector<std::string> selectors;
   for (JsValueList::iterator it = result.begin(); it != result.end(); ++it)
     selectors.push_back((*it)->AsString());
   return selectors;
 #endif
 }