From 809da8f2ae78d695b3f8c01ecb47f3037391eddf Mon Sep 17 00:00:00 2001
From: Felipe Gomes <felipc@gmail.com>
Date: Mon, 2 Jul 2012 20:45:00 -0700
Subject: [PATCH] Bug 770297. Call to isLaunchable needs to use the app origin,
 and not the install origin. r=fabrice

---
 dom/apps/src/Webapps.jsm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dom/apps/src/Webapps.jsm b/dom/apps/src/Webapps.jsm
index 4cf42de99859..018929a633f8 100644
--- a/dom/apps/src/Webapps.jsm
+++ b/dom/apps/src/Webapps.jsm
@@ -301,7 +301,7 @@ let DOMApplicationRegistry = {
     let tmp = [];
     let id = this._appId(aData.origin);
 
-    if (id && this._isLaunchable(aData.origin)) {
+    if (id && this._isLaunchable(this.webapps[id].origin)) {
       let app = this._cloneAppObject(this.webapps[id]);
       aData.apps.push(app);
       tmp.push({ id: id });
@@ -320,7 +320,7 @@ let DOMApplicationRegistry = {
 
     for (let id in this.webapps) {
       if (this.webapps[id].installOrigin == aData.origin &&
-          this._isLaunchable(aData.origin)) {
+          this._isLaunchable(this.webapps[id].origin)) {
         aData.apps.push(this._cloneAppObject(this.webapps[id]));
         tmp.push({ id: id });
       }
@@ -339,7 +339,7 @@ let DOMApplicationRegistry = {
 
     for (let id in this.webapps) {
       if (this.webapps[id].installOrigin == aData.origin &&
-          !this._isLaunchable(aData.origin)) {
+          !this._isLaunchable(this.webapps[id].origin)) {
         aData.apps.push(this._cloneAppObject(this.webapps[id]));
         tmp.push({ id: id });
       }
@@ -358,7 +358,7 @@ let DOMApplicationRegistry = {
 
     for (let id in this.webapps) {
       let app = this._cloneAppObject(this.webapps[id]);
-      if (!this._isLaunchable(app.installOrigin))
+      if (!this._isLaunchable(app.origin))
         continue;
 
       aData.apps.push(app);