From 1ab10e10f579e0e70104225eae2c6567c999dd6e Mon Sep 17 00:00:00 2001
From: "rob_strong%exchangecode.com" <rob_strong%exchangecode.com>
Date: Mon, 6 Feb 2006 19:12:40 +0000
Subject: [PATCH] Bug 323436 - ExtensionDataSource.prototype.GetTargets passes
 EM_NS to stripPrefix. r=bsmedberg

---
 toolkit/mozapps/extensions/src/nsExtensionManager.js.in | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/toolkit/mozapps/extensions/src/nsExtensionManager.js.in b/toolkit/mozapps/extensions/src/nsExtensionManager.js.in
index 3a8c38f71a02..0abf8b6cab6c 100644
--- a/toolkit/mozapps/extensions/src/nsExtensionManager.js.in
+++ b/toolkit/mozapps/extensions/src/nsExtensionManager.js.in
@@ -6888,7 +6888,7 @@ ExtensionsDataSource.prototype = {
                     stripPrefix(item.Value, PREFIX_ITEM_URI)) + 
                     stripPrefix(property.Value, PREFIX_NS_EM);
     var i = 0;
-    do {
+    while (true) {
       try {
         var value = gPref.getComplexValue(prefName + "." + ++i, 
                                           Components.interfaces.nsIPrefLocalizedString);
@@ -6907,8 +6907,7 @@ ExtensionsDataSource.prototype = {
         break;
       }
     }
-    while (1);
-    return values;
+    return values.length > 0 ? values : null;
   },
   
   /**
@@ -6934,7 +6933,7 @@ ExtensionsDataSource.prototype = {
       return null;
       
     var ary = null;
-    var getter = "_rdfGets_" + stripPrefix(source.Value, EM_NS);
+    var getter = "_rdfGets_" + stripPrefix(property.Value, PREFIX_NS_EM);
     if (getter in this)
       ary = this[getter](source, property);