Issue 1107.update1 - read Notification properties (title, message and type) on the fly

src/FilterEngine.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 247 matching lines @@
 }
 
 NotificationPtr FilterEngine::GetNextNotificationToShow(const std::string& url)
 {
   JsValuePtr func = jsEngine->Evaluate("API.getNextNotificationToShow");
   JsValueList params;
   if (!url.empty())
   {
     params.push_back(jsEngine->NewValue(url));
   }
-  return Notification::JsValueToNotification(func->Call(params));
+  auto jsNotification = func->Call(params);

[Felix Dahlke, 2015/01/27 13:09:09]

C++03! :)

[sergei, 2015/01/27 13:20:12]

fixed, sorry

+  if (!jsNotification->IsObject())
+  {
+    return NotificationPtr();
+  }
+  return NotificationPtr(new Notification(jsNotification));
 }
 
 AdblockPlus::FilterPtr FilterEngine::Matches(const std::string& url,
     ContentType contentType,
     const std::string& documentUrl) const
 {
   std::vector<std::string> documentUrls;
   documentUrls.push_back(documentUrl);
   return Matches(url, contentType, documentUrls);
 }
@@ skipping 136 matching lines @@
 }
 
 int FilterEngine::CompareVersions(const std::string& v1, const std::string& v2)
 {
   JsValueList params;
   params.push_back(jsEngine->NewValue(v1));
   params.push_back(jsEngine->NewValue(v2));
   JsValuePtr func = jsEngine->Evaluate("API.compareVersions");
   return func->Call(params)->AsInt();
 }