diff --git a/embedding/config/basebrowser-installer-win.pkg b/embedding/config/basebrowser-installer-win.pkg index 2690de81343..c0b16e61b28 100644 --- a/embedding/config/basebrowser-installer-win.pkg +++ b/embedding/config/basebrowser-installer-win.pkg @@ -131,7 +131,6 @@ mozipcd.exe ipc\modules\lockmodule.dll ipc\modules\transmngr.dll components\ipcdc.dll -components\transmngr_client.dll ; session history components\shistory.xpt diff --git a/embedding/config/basebrowser-mac-macho b/embedding/config/basebrowser-mac-macho index ef98e9ddd35..708053b4fe5 100644 --- a/embedding/config/basebrowser-mac-macho +++ b/embedding/config/basebrowser-mac-macho @@ -146,7 +146,6 @@ ipc/modules/liblockmodule.dylib ipc/modules/libtransmngr.dylib mozipcd components/libipcdc.dylib -components/libtransmngr_client.dylib ; wallet ; Optional - only if you need password persistence diff --git a/embedding/config/basebrowser-win b/embedding/config/basebrowser-win index 4b466b345f1..63655aaa0ea 100644 --- a/embedding/config/basebrowser-win +++ b/embedding/config/basebrowser-win @@ -134,7 +134,6 @@ mozipcd.exe ipc\modules\lockmodule.dll ipc\modules\transmngr.dll components\ipcdc.dll -components\transmngr_client.dll ; session history components\shistory.xpt diff --git a/profile/dirserviceprovider/src/Makefile.in b/profile/dirserviceprovider/src/Makefile.in index 3f5240fc465..528047f4ff2 100755 --- a/profile/dirserviceprovider/src/Makefile.in +++ b/profile/dirserviceprovider/src/Makefile.in @@ -48,7 +48,7 @@ REQUIRES = xpcom \ $(NULL) ifdef MOZ_PROFILESHARING -REQUIRES += transmngr \ +REQUIRES += ipcd \ profilesharingsetup \ $(NULL) endif diff --git a/profile/dirserviceprovider/src/nsProfileDirServiceProvider.cpp b/profile/dirserviceprovider/src/nsProfileDirServiceProvider.cpp index 06c051cf22a..14d385dc101 100755 --- a/profile/dirserviceprovider/src/nsProfileDirServiceProvider.cpp +++ b/profile/dirserviceprovider/src/nsProfileDirServiceProvider.cpp @@ -49,7 +49,7 @@ #ifdef MOZ_PROFILESHARING #include "nsIProfileSharingSetup.h" -#include "tmITransactionService.h" +#include "ipcITransactionService.h" #endif // File Name Defines @@ -127,8 +127,8 @@ nsProfileDirServiceProvider::SetProfileDir(nsIFile* aProfileDir) #ifdef MOZ_PROFILESHARING if (mSharingEnabled) { - nsCOMPtr transServ = - do_GetService("@mozilla.org/transaction/service;1", &rv); + nsCOMPtr transServ = + do_GetService(IPC_TRANSACTIONSERVICE_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) { nsCAutoString nativePath; rv = mProfileDir->GetNativePath(nativePath);