Permalink
Browse files

Bug 826589 - (Part 1) Pass manifest to activity picker instead of pre…

…-translated title. r=ttaubert a=bb+
  • Loading branch information...
1 parent 15c50e6 commit 64f1cdba0aedd984d851c84f66407c4bac21f6d1 @leibovic leibovic committed Jan 7, 2013
Showing with 1 addition and 5 deletions.
  1. +1 −1 b2g/components/ActivitiesGlue.js
  2. +0 −3 dom/activities/src/ActivitiesService.jsm
  3. +0 −1 dom/apps/src/Webapps.jsm
@@ -24,7 +24,7 @@ ActivitiesDialog.prototype = {
let choices = [];
activity.list.forEach(function(item) {
- choices.push({ title: item.title, icon: item.icon });
+ choices.push({ manifest: item.manifest, icon: item.icon });
});
@@ -52,7 +52,6 @@ ActivitiesDb.prototype = {
* id: String
* manifest: String
* name: String
- * title: String
* icon: String
* description: jsval
* }
@@ -94,7 +93,6 @@ ActivitiesDb.prototype = {
let object = {
manifest: aObject.manifest,
name: aObject.name,
- title: aObject.title || "",
icon: aObject.icon || "",
description: aObject.description
};
@@ -140,7 +138,6 @@ ActivitiesDb.prototype = {
txn.result.options.push({
manifest: result.manifest,
- title: result.title,
icon: result.icon,
description: result.description
});
@@ -496,7 +496,6 @@ this.DOMApplicationRegistry = {
if (aRunUpdate) {
activitiesToRegister.push({ "manifest": aApp.manifestURL,
"name": activity,
- "title": manifest.name,
"icon": manifest.iconURLForSize(128),
"description": description });
}

0 comments on commit 64f1cdb

Please sign in to comment.