Bug 1413656 - Port bug 1398972: Use our own pluginBlocked.svg icon after removal of it in M-C. r=jorgk
authorRichard Marti <richard.marti@gmail.com>
Wed, 01 Nov 2017 21:52:32 +0100
changeset 29302 b0f6dcd3c3dbb0f82ec0539d10ad54bec928e879
parent 29301 1341b68d3793768c46948792ac93bf7cf9bf6cac
child 29303 bb96540a652557271e302ae468c18689b6c5d811
push id2068
push userclokep@gmail.com
push dateMon, 13 Nov 2017 19:02:14 +0000
treeherdercomm-beta@9c7e7ce8672b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjorgk
bugs1413656, 1398972
Bug 1413656 - Port bug 1398972: Use our own pluginBlocked.svg icon after removal of it in M-C. r=jorgk
mail/base/content/plugins.js
mail/themes/shared/jar.inc.mn
mail/themes/shared/mail/icons/pluginBlocked.svg
--- a/mail/base/content/plugins.js
+++ b/mail/base/content/plugins.js
@@ -376,17 +376,17 @@ var gPluginHandler = {
                             Ci.nsIAppStartup.eAttemptQuit);
     }
 
     let messengerBundle = document.getElementById("bundle_messenger");
 
     let notifications = {
       PluginBlocklisted : {
         barID: "blocked-plugins",
-        iconURL: "chrome://mozapps/skin/plugins/pluginBlocked.svg",
+        iconURL: "chrome://messenger/skin/icons/pluginBlocked.svg",
         message: messengerBundle.getString("blockedpluginsMessage.title"),
         buttons: [{
           label: messengerBundle.getString("blockedpluginsMessage.infoButton.label"),
           accessKey: messengerBundle.getString("blockedpluginsMessage.infoButton.accesskey"),
           popup: null,
           callback: showBlocklistInfo
         },
         {
--- a/mail/themes/shared/jar.inc.mn
+++ b/mail/themes/shared/jar.inc.mn
@@ -41,16 +41,17 @@
   skin/classic/messenger/icons/junk.svg                       (../shared/mail/icons/junk.svg)
   skin/classic/messenger/icons/mark.svg                       (../shared/mail/icons/mark.svg)
   skin/classic/messenger/icons/message.svg                    (../shared/mail/icons/message.svg)
   skin/classic/messenger/icons/newmsg.svg                     (../shared/mail/icons/newmsg.svg)
   skin/classic/messenger/icons/nextmsg.svg                    (../shared/mail/icons/nextmsg.svg)
   skin/classic/messenger/icons/nextunread.svg                 (../shared/mail/icons/nextunread.svg)
   skin/classic/messenger/icons/overflow-indicator.png         (../shared/mail/icons/overflow-indicator.png)
   skin/classic/messenger/icons/paste.svg                      (../shared/mail/icons/paste.svg)
+  skin/classic/messenger/icons/pluginBlocked.svg              (../shared/mail/icons/pluginBlocked.svg)
   skin/classic/messenger/icons/previousmsg.svg                (../shared/mail/icons/previousmsg.svg)
   skin/classic/messenger/icons/previousunread.svg             (../shared/mail/icons/previousunread.svg)
   skin/classic/messenger/icons/print.svg                      (../shared/mail/icons/print.svg)
   skin/classic/messenger/icons/quote.svg                      (../shared/mail/icons/quote.svg)
   skin/classic/messenger/icons/remote-blocked.svg             (../shared/mail/icons/remote-blocked.svg)
   skin/classic/messenger/icons/reply.svg                      (../shared/mail/icons/reply.svg)
   skin/classic/messenger/icons/replyall.svg                   (../shared/mail/icons/replyall.svg)
   skin/classic/messenger/icons/replylist.svg                  (../shared/mail/icons/replylist.svg)
new file mode 100644
--- /dev/null
+++ b/mail/themes/shared/mail/icons/pluginBlocked.svg
@@ -0,0 +1,8 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+  <path d="M6 7h6a2 2 0 0 0 0-4H6a2 2 0 0 0 0 4zm14 0h6a2 2 0 0 0 0-4h-6a2 2 0 0 0 0 4zm8 2H4a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h11.349A9.987 9.987 0 0 1 30 16.014V11a2 2 0 0 0-2-2z" fill="#ff0039"/>
+  <circle cx="24" cy="24" r="8" fill="#a4000f"/>
+  <rect x="18" y="22" width="12" height="4" rx="1" ry="1" fill="#fff"/>
+</svg>