Merge pull request #11829 from crh0716/900870

Bug 900870 - Register to onpairedstatuschanged and remove bluetooth-pairedstatuschanged system message r=evelyn
mozilla-b2g · Sep 6, 2013 · 420a072 · 420a072
2 parents 3384ddd + 8b221b7
commit 420a072
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/apps/settings/js/bluetooth.js b/apps/settings/js/bluetooth.js
@@ -353,12 +353,10 @@ navigator.mozL10n.ready(function bluetoothSettings() {
         }
       );
 
-      navigator.mozSetMessageHandler('bluetooth-pairedstatuschanged',
-        function bt_getPairedMessage(message) {
-          dispatchEvent(new CustomEvent('bluetooth-pairedstatuschanged'));
-          showDevicePaired(message.paired, 'Authentication Failed');
-        }
-      );
+      defaultAdapter.onpairedstatuschanged = function bt_getPairedMessage(evt) {
+        dispatchEvent(new CustomEvent('bluetooth-pairedstatuschanged'));
+        showDevicePaired(evt.status, 'Authentication Failed');
+      };
 
       defaultAdapter.onhfpstatuschanged = function bt_getConnectedMessage(evt) {
         showDeviceConnected(evt.address, evt.status);

diff --git a/apps/settings/manifest.webapp b/apps/settings/manifest.webapp
@@ -39,8 +39,7 @@
     }
   },
   "messages": ["bluetooth-pairing-request",
-               "bluetooth-cancel",
-               "bluetooth-pairedstatuschanged"],
+               "bluetooth-cancel"],
   "locales": {
     "ar": {
       "name": "الضبط",