Issue 3153 - Removed redundant handling of add-subscription message

options.js

 /*
  * 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 77 matching lines @@
       {
         NotificationStorage.toggleIgnoreCategory("*");
         return this.get();
       }
     });
   }
   else
     document.getElementById("shouldShowNotificationsContainer").hidden = true;
 
   ext.onMessage.addListener(onMessage);
+  ext.backgroundPage.sendMessage({
+    type: "app.listen",
+    filter: ["addSubscription"]
+  });
 
   // Load recommended subscriptions
   loadRecommendations();
 
   // Show user's filters
   reloadFilters();
 }
 $(loadOptions);
 
 function onMessage(msg)
 {
-  if (msg.type == "add-subscription")
-    startSubscriptionSelection(msg.title, msg.url);
+  if (msg.type == "app.listen")
+  {
+    if (msg.action == "addSubscription")
+    {
+      var subscription = msg.args[0];
+      startSubscriptionSelection(subscription.title, subscription.url);
+    }
+  }
   else if (msg.type == "focus-section")
   {
     var tabs = document.getElementsByClassName("ui-tabs-panel");
     for (var i = 0; i < tabs.length; i++)
     {
       var found = tabs[i].querySelector("[data-section='" + msg.section + "']");
       if (!found)
         continue;
 
       var previous = document.getElementsByClassName("focused");
@@ skipping 561 matching lines @@
       links[i].href = arguments[i + 1];
       links[i].setAttribute("target", "_blank");
     }
     else if (typeof arguments[i + 1] == "function")
     {
       links[i].href = "javascript:void(0);";
       links[i].addEventListener("click", arguments[i + 1], false);
     }
   }
 }