Bug 924971 - [Contacts] Trying to add a contact as a recipient opens …

…contact details instead of returning to Messages app. r=fabrice
dothq · Oct 17, 2013 · b206e0b · b206e0b
1 parent 3228d56
commit b206e0b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/dom/base/DOMRequestHelper.jsm b/dom/base/DOMRequestHelper.jsm
@@ -52,7 +52,8 @@ DOMRequestIpcHelper.prototype = {
    * queryInterface method and adds at least one weak listener to the Message
    * Manager MUST implement Ci.nsISupportsWeakReference.
    */
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsISupportsWeakReference]),
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsISupportsWeakReference,
+                                         Ci.nsIObserver]),
 
    /**
    *  'aMessages' is expected to be an array of either:

diff --git a/dom/messages/SystemMessageManager.js b/dom/messages/SystemMessageManager.js
@@ -284,6 +284,9 @@ SystemMessageManager.prototype = {
     if (aTopic === kSystemMessageInternalReady) {
       this._registerManifest();
     }
+
+    // Call the DOMRequestIpcHelper.observe method.
+    this.__proto__.__proto__.observe.call(this, aSubject, aTopic, aData);
   },
 
   _registerManifest: function sysMessMgr_registerManifest() {