From 441c1dd82284b4d9bcf8de4436fb1705ca988780 Mon Sep 17 00:00:00 2001
From: Chris <chris@chrismatic.io>
Date: Sat, 14 Mar 2015 17:51:00 -0600
Subject: [PATCH] Use prefix for Safari-specific icons

---
 platform/safari/Info.plist                          |   2 +-
 platform/safari/vapi-background.js                  |   2 +-
 .../{icon16-off.png => safari-icon16-off.png}       | Bin
 .../{icon16-off.svg => safari-icon16-off.svg}       |   0
 .../{icon16-off@2x.png => safari-icon16-off@2x.png} | Bin
 .../browsericons/{icon16.png => safari-icon16.png}  | Bin
 .../browsericons/{icon16.svg => safari-icon16.svg}  |   0
 .../{icon16@2x.png => safari-icon16@2x.png}         | Bin
 8 files changed, 2 insertions(+), 2 deletions(-)
 rename src/img/browsericons/{icon16-off.png => safari-icon16-off.png} (100%)
 rename src/img/browsericons/{icon16-off.svg => safari-icon16-off.svg} (100%)
 rename src/img/browsericons/{icon16-off@2x.png => safari-icon16-off@2x.png} (100%)
 rename src/img/browsericons/{icon16.png => safari-icon16.png} (100%)
 rename src/img/browsericons/{icon16.svg => safari-icon16.svg} (100%)
 rename src/img/browsericons/{icon16@2x.png => safari-icon16@2x.png} (100%)

diff --git a/platform/safari/Info.plist b/platform/safari/Info.plist
index 06bfd9ffc..a36cc034f 100644
--- a/platform/safari/Info.plist
+++ b/platform/safari/Info.plist
@@ -37,7 +37,7 @@
                 <key>Identifier</key>
                 <string>toolbarItem</string>
                 <key>Image</key>
-                <string>img/browsericons/icon16.png</string>
+                <string>img/browsericons/safari-icon16.png</string>
                 <key>Label</key>
                 <string>{name}</string>
                 <key>Palette Label</key>
diff --git a/platform/safari/vapi-background.js b/platform/safari/vapi-background.js
index be51b0e06..72217e302 100644
--- a/platform/safari/vapi-background.js
+++ b/platform/safari/vapi-background.js
@@ -517,7 +517,7 @@
             state = vAPI.tabIconState[tabId] = new TabIconState();
         }
         icon.badge = state.badge;
-        icon.image = vAPI.getURL("img/browsericons/icon16" + state.img + ".png");
+        icon.image = vAPI.getURL("img/browsericons/safari-icon16" + state.img + ".png");
     };
     vAPI.setIcon = function(tabId, iconStatus, badge) {
         var state = vAPI.tabIconState[tabId];
diff --git a/src/img/browsericons/icon16-off.png b/src/img/browsericons/safari-icon16-off.png
similarity index 100%
rename from src/img/browsericons/icon16-off.png
rename to src/img/browsericons/safari-icon16-off.png
diff --git a/src/img/browsericons/icon16-off.svg b/src/img/browsericons/safari-icon16-off.svg
similarity index 100%
rename from src/img/browsericons/icon16-off.svg
rename to src/img/browsericons/safari-icon16-off.svg
diff --git a/src/img/browsericons/icon16-off@2x.png b/src/img/browsericons/safari-icon16-off@2x.png
similarity index 100%
rename from src/img/browsericons/icon16-off@2x.png
rename to src/img/browsericons/safari-icon16-off@2x.png
diff --git a/src/img/browsericons/icon16.png b/src/img/browsericons/safari-icon16.png
similarity index 100%
rename from src/img/browsericons/icon16.png
rename to src/img/browsericons/safari-icon16.png
diff --git a/src/img/browsericons/icon16.svg b/src/img/browsericons/safari-icon16.svg
similarity index 100%
rename from src/img/browsericons/icon16.svg
rename to src/img/browsericons/safari-icon16.svg
diff --git a/src/img/browsericons/icon16@2x.png b/src/img/browsericons/safari-icon16@2x.png
similarity index 100%
rename from src/img/browsericons/icon16@2x.png
rename to src/img/browsericons/safari-icon16@2x.png