From 3fec8e01d3c8341bab22994621285e28e2f930b2 Mon Sep 17 00:00:00 2001
From: "rob_strong%exchangecode.com"
 <rob_strong%exchangecode.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 11 Sep 2006 18:13:31 +0000
Subject: [PATCH] Bug 340786 - installing xpi by placing xpi in extension
 folder doesn't work again. r=bsmedberg

git-svn-id: svn://10.0.0.236/trunk@209735 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../mozapps/extensions/src/nsExtensionManager.js.in        | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/mozilla/toolkit/mozapps/extensions/src/nsExtensionManager.js.in b/mozilla/toolkit/mozapps/extensions/src/nsExtensionManager.js.in
index 22537c82844..fad49f90408 100644
--- a/mozilla/toolkit/mozapps/extensions/src/nsExtensionManager.js.in
+++ b/mozilla/toolkit/mozapps/extensions/src/nsExtensionManager.js.in
@@ -3246,12 +3246,9 @@ ExtensionManager.prototype = {
           var item = this._getItemForDroppedFile(entry, location);
           if (item) {
             droppedInFiles.push({ file: entry, location: location });
-
-            var zipReader = Components.classes["@mozilla.org/libjar/zip-reader;1"]
-                                      .createInstance(Components.interfaces.nsIZipReader);
-            zipReader.open(entry);
             var prettyName = "";
             try {
+              var zipReader = getZipReaderForFile(entry);
               var principal = { };
               var certPrincipal = zipReader.getCertificatePrincipal(null, principal);
               // XXXbz This string could be empty.  This needs better
@@ -3259,6 +3256,8 @@ ExtensionManager.prototype = {
               prettyName = principal.value.prettyName;
             }
             catch (e) { }
+            if (zipReader)
+              zipReader.close();
             xpinstallStrings = xpinstallStrings.concat([item.name, 
                                                         getURLSpecFromFile(entry),
                                                         item.iconURL,