Bug 801546 - [gallery] [camera] Not able to add a photo to a contact from contact details; r=cjones a=blocking-basecamp
authorFabrice Desré <fabrice@mozilla.com>
Fri, 19 Oct 2012 13:53:51 -0700
changeset 116247 5d8ecf567de33fe4a48b3db108a9141c52f32aaf
parent 116246 46d6d05da75e485fc120b313ce62269f1a1b6088
child 116248 733109bd4ed158fccf5ce47891ff51c3e415513d
push id1708
push userakeybl@mozilla.com
push dateMon, 19 Nov 2012 21:10:21 +0000
treeherdermozilla-beta@27b14fe50103 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscjones, blocking-basecamp
bugs801546
milestone18.0a2
Bug 801546 - [gallery] [camera] Not able to add a photo to a contact from contact details; r=cjones a=blocking-basecamp
dom/activities/src/ActivitiesService.jsm
--- a/dom/activities/src/ActivitiesService.jsm
+++ b/dom/activities/src/ActivitiesService.jsm
@@ -276,23 +276,25 @@ let Activities = {
 
   receiveMessage: function activities_receiveMessage(aMessage) {
     let mm = aMessage.target;
     let msg = aMessage.json;
 
     let caller;
     let obsData;
 
-    if (aMessage.name == "Activity:FireSuccess" ||
-        aMessage.name == "Activity:FireError") {
+    if (aMessage.name == "Activity:PostResult" ||
+        aMessage.name == "Activity:PostError") {
       caller = this.callers[msg.id];
       if (caller) {
         obsData = JSON.stringify({ manifestURL: caller.manifestURL,
                                    pageURL: caller.pageURL,
-                                   success: aMessage.name == "Activity:FireSuccess" });
+                                   success: aMessage.name == "Activity:PostResult" });
+      } else {
+        debug("!! caller is null for msg.id=" + msg.id);
       }
     }
 
     switch(aMessage.name) {
       case "Activity:Start":
         this.callers[msg.id] = { mm: aMessage.target,
                                  manifestURL: msg.manifestURL,
                                  pageURL: msg.pageURL };