Bug 801546 - [gallery] [camera] Not able to add a photo to a contact from contact details [r=cjones]
authorFabrice Desré <fabrice@mozilla.com>
Fri, 19 Oct 2012 13:53:51 -0700
changeset 110814 81c2eb10eb8271b510ca99ddefb969f26edfed94
parent 110813 43eca3085ddc890e7791bfa6547de22cc3241495
child 110815 e0ddf5c89441a592d1ed9e846bad8216a478ae08
push id16765
push userfdesre@mozilla.com
push dateFri, 19 Oct 2012 20:54:48 +0000
treeherdermozilla-inbound@81c2eb10eb82 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscjones
bugs801546
milestone19.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 801546 - [gallery] [camera] Not able to add a photo to a contact from contact details [r=cjones]
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 };