wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1108900 - Part 2: rename MmsService. r=echen

Browse Source
This commit is contained in:
Bevis Tseng 2014-12-10 16:14:19 +08:00
parent 552be75f56
commit 37618643d1
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/mobilemessage/MobileMessageManager.cpp
View File

@ -745,7 +745,7 @@ NS_CreateMmsService()
mmsService = SmsIPCService::GetSingleton(); mmsService = SmsIPCService::GetSingleton();
} else { } else {
#if defined(MOZ_WIDGET_GONK) && defined(MOZ_B2G_RIL) #if defined(MOZ_WIDGET_GONK) && defined(MOZ_B2G_RIL)
mmsService = do_CreateInstance("@mozilla.org/mms/rilmmsservice;1"); mmsService = do_CreateInstance("@mozilla.org/mms/gonkmmsservice;1");
#endif #endif
} }

6
dom/mobilemessage/gonk/MmsService.js
View File

@ -13,8 +13,8 @@ Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/PhoneNumberUtils.jsm"); Cu.import("resource://gre/modules/PhoneNumberUtils.jsm");
Cu.import("resource://gre/modules/Promise.jsm"); Cu.import("resource://gre/modules/Promise.jsm");
const RIL_MMSSERVICE_CONTRACTID = "@mozilla.org/mms/rilmmsservice;1"; const GONK_MMSSERVICE_CONTRACTID = "@mozilla.org/mms/gonkmmsservice;1";
const RIL_MMSSERVICE_CID = Components.ID("{217ddd76-75db-4210-955d-8806cd8d87f9}"); const GONK_MMSSERVICE_CID = Components.ID("{9b069b8c-8697-11e4-a406-474f5190272b}");
let DEBUG = false; let DEBUG = false;
function debug(s) { function debug(s) {
@ -1536,7 +1536,7 @@ function MmsService() {
} }
MmsService.prototype = { MmsService.prototype = {
classID: RIL_MMSSERVICE_CID, classID: GONK_MMSSERVICE_CID,
QueryInterface: XPCOMUtils.generateQI([Ci.nsIMmsService, QueryInterface: XPCOMUtils.generateQI([Ci.nsIMmsService,
Ci.nsIWapPushApplication, Ci.nsIWapPushApplication,
Ci.nsIObserver]), Ci.nsIObserver]),

4
dom/mobilemessage/gonk/MmsService.manifest
View File

@ -1,3 +1,3 @@
# MmsService.js # MmsService.js
component {217ddd76-75db-4210-955d-8806cd8d87f9} MmsService.js component {9b069b8c-8697-11e4-a406-474f5190272b} MmsService.js
contract @mozilla.org/mms/rilmmsservice;1 {217ddd76-75db-4210-955d-8806cd8d87f9} contract @mozilla.org/mms/gonkmmsservice;1 {9b069b8c-8697-11e4-a406-474f5190272b}

2
dom/mobilemessage/gonk/MobileMessageDB.jsm
View File

@ -73,7 +73,7 @@ XPCOMUtils.defineLazyServiceGetter(this, "gMobileMessageService",
"nsIMobileMessageService"); "nsIMobileMessageService");
XPCOMUtils.defineLazyServiceGetter(this, "gMMSService", XPCOMUtils.defineLazyServiceGetter(this, "gMMSService",
"@mozilla.org/mms/rilmmsservice;1", "@mozilla.org/mms/gonkmmsservice;1",
"nsIMmsService"); "nsIMmsService");
XPCOMUtils.defineLazyGetter(this, "MMS", function() { XPCOMUtils.defineLazyGetter(this, "MMS", function() {

2
dom/mobilemessage/tests/marionette/test_error_of_mms_manual_retrieval.js
View File

@ -20,7 +20,7 @@ let gUuidGenerator =
Cc["@mozilla.org/uuid-generator;1"] Cc["@mozilla.org/uuid-generator;1"]
.getService(Ci.nsIUUIDGenerator); .getService(Ci.nsIUUIDGenerator);
let gMmsService = Cc["@mozilla.org/mms/rilmmsservice;1"] let gMmsService = Cc["@mozilla.org/mms/gonkmmsservice;1"]
.getService(Ci.nsIMmsService); .getService(Ci.nsIMmsService);
function saveMmsNotification() { function saveMmsNotification() {

2
dom/wappush/gonk/WapPushManager.js
View File

@ -84,7 +84,7 @@ this.WapPushManager = {
let msg; let msg;
let authInfo = null; let authInfo = null;
if (contentType === "application/vnd.wap.mms-message") { if (contentType === "application/vnd.wap.mms-message") {
let mmsService = Cc["@mozilla.org/mms/rilmmsservice;1"] let mmsService = Cc["@mozilla.org/mms/gonkmmsservice;1"]
.getService(Ci.nsIMmsService); .getService(Ci.nsIMmsService);
mmsService.QueryInterface(Ci.nsIWapPushApplication) mmsService.QueryInterface(Ci.nsIWapPushApplication)
.receiveWapPush(data.array, data.array.length, data.offset, options); .receiveWapPush(data.array, data.array.length, data.offset, options);