From 825e9657fa895531a59c8a5f9500a6dcbf9482d4 Mon Sep 17 00:00:00 2001
From: Sachin Hosmani <sachinhosmani2@gmail.com>
Date: Tue, 23 Apr 2013 12:04:30 +0530
Subject: [PATCH] Bug 842780 - about:newaddon doesn't restrict size of the
 add-on's icon. r=Unfocused

---
 toolkit/mozapps/extensions/content/newaddon.js         | 4 ++--
 toolkit/themes/linux/mozapps/extensions/newaddon.css   | 2 ++
 toolkit/themes/osx/mozapps/extensions/newaddon.css     | 2 ++
 toolkit/themes/windows/mozapps/extensions/newaddon.css | 2 ++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/toolkit/mozapps/extensions/content/newaddon.js b/toolkit/mozapps/extensions/content/newaddon.js
index 50ce4388640d..2b2a54af5b5a 100644
--- a/toolkit/mozapps/extensions/content/newaddon.js
+++ b/toolkit/mozapps/extensions/content/newaddon.js
@@ -51,7 +51,7 @@ function initialize() {
     gAddon = aAddon;
 
     document.getElementById("addon-info").setAttribute("type", aAddon.type);
-    
+
     let icon = document.getElementById("icon");
     if (aAddon.icon64URL)
       icon.src = aAddon.icon64URL;
@@ -60,7 +60,7 @@ function initialize() {
 
     let name = bundle.formatStringFromName("name", [aAddon.name, aAddon.version],
                                            2);
-    document.getElementById("name").value = name
+    document.getElementById("name").value = name;
 
     if (aAddon.creator) {
       let creator = bundle.formatStringFromName("author", [aAddon.creator], 1);
diff --git a/toolkit/themes/linux/mozapps/extensions/newaddon.css b/toolkit/themes/linux/mozapps/extensions/newaddon.css
index 59d4b3a70e96..2e5e25210617 100644
--- a/toolkit/themes/linux/mozapps/extensions/newaddon.css
+++ b/toolkit/themes/linux/mozapps/extensions/newaddon.css
@@ -36,6 +36,8 @@
 
 #icon {
   -moz-margin-end: 10px;
+  max-width: 64px;
+  max-height: 64px;
   list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
 }
 
diff --git a/toolkit/themes/osx/mozapps/extensions/newaddon.css b/toolkit/themes/osx/mozapps/extensions/newaddon.css
index 4e012c7d38c2..5bf04fab1dc6 100644
--- a/toolkit/themes/osx/mozapps/extensions/newaddon.css
+++ b/toolkit/themes/osx/mozapps/extensions/newaddon.css
@@ -38,6 +38,8 @@
 
 #icon {
   -moz-margin-end: 10px;
+  max-width: 64px;
+  max-height: 64px;
   list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
 }
 
diff --git a/toolkit/themes/windows/mozapps/extensions/newaddon.css b/toolkit/themes/windows/mozapps/extensions/newaddon.css
index 34ebf9d255b1..b3c429ec7bf5 100644
--- a/toolkit/themes/windows/mozapps/extensions/newaddon.css
+++ b/toolkit/themes/windows/mozapps/extensions/newaddon.css
@@ -36,6 +36,8 @@
 
 #icon {
   -moz-margin-end: 10px;
+  max-width: 64px;
+  max-height: 64px;
   list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
 }