зеркало из https://github.com/mozilla/pjs.git
bug 204255
this patch fixes/cleans-up several things: 1- honor ENABLE_TESTS build var 2- don't export intermediate static libs (bug 205025) 3- tmITransactionService should be ipcITransactionService 4- transaction service should not be a separate xpcom component library plus some minor changes: 5- separate interfaces out into individual IDL file 6- get rid of *CID.h files (move CID/ContractID into IDL).. i think *CID.h files are just overkill in this case. there should either be just one ipcCID.h file for all IDs or none. r=ccarlen, sr=alecf, a=sspitzer
This commit is contained in:
Родитель
2d3f50e8e5
Коммит
716f37a555
|
@ -131,7 +131,6 @@ mozipcd.exe
|
||||||
ipc\modules\lockmodule.dll
|
ipc\modules\lockmodule.dll
|
||||||
ipc\modules\transmngr.dll
|
ipc\modules\transmngr.dll
|
||||||
components\ipcdc.dll
|
components\ipcdc.dll
|
||||||
components\transmngr_client.dll
|
|
||||||
|
|
||||||
; session history
|
; session history
|
||||||
components\shistory.xpt
|
components\shistory.xpt
|
||||||
|
|
|
@ -146,7 +146,6 @@ ipc/modules/liblockmodule.dylib
|
||||||
ipc/modules/libtransmngr.dylib
|
ipc/modules/libtransmngr.dylib
|
||||||
mozipcd
|
mozipcd
|
||||||
components/libipcdc.dylib
|
components/libipcdc.dylib
|
||||||
components/libtransmngr_client.dylib
|
|
||||||
|
|
||||||
; wallet
|
; wallet
|
||||||
; Optional - only if you need password persistence
|
; Optional - only if you need password persistence
|
||||||
|
|
|
@ -134,7 +134,6 @@ mozipcd.exe
|
||||||
ipc\modules\lockmodule.dll
|
ipc\modules\lockmodule.dll
|
||||||
ipc\modules\transmngr.dll
|
ipc\modules\transmngr.dll
|
||||||
components\ipcdc.dll
|
components\ipcdc.dll
|
||||||
components\transmngr_client.dll
|
|
||||||
|
|
||||||
; session history
|
; session history
|
||||||
components\shistory.xpt
|
components\shistory.xpt
|
||||||
|
|
|
@ -48,7 +48,7 @@ REQUIRES = xpcom \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
ifdef MOZ_PROFILESHARING
|
ifdef MOZ_PROFILESHARING
|
||||||
REQUIRES += transmngr \
|
REQUIRES += ipcd \
|
||||||
profilesharingsetup \
|
profilesharingsetup \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -49,7 +49,7 @@
|
||||||
|
|
||||||
#ifdef MOZ_PROFILESHARING
|
#ifdef MOZ_PROFILESHARING
|
||||||
#include "nsIProfileSharingSetup.h"
|
#include "nsIProfileSharingSetup.h"
|
||||||
#include "tmITransactionService.h"
|
#include "ipcITransactionService.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// File Name Defines
|
// File Name Defines
|
||||||
|
@ -127,8 +127,8 @@ nsProfileDirServiceProvider::SetProfileDir(nsIFile* aProfileDir)
|
||||||
|
|
||||||
#ifdef MOZ_PROFILESHARING
|
#ifdef MOZ_PROFILESHARING
|
||||||
if (mSharingEnabled) {
|
if (mSharingEnabled) {
|
||||||
nsCOMPtr<tmITransactionService> transServ =
|
nsCOMPtr<ipcITransactionService> transServ =
|
||||||
do_GetService("@mozilla.org/transaction/service;1", &rv);
|
do_GetService(IPC_TRANSACTIONSERVICE_CONTRACTID, &rv);
|
||||||
if (NS_SUCCEEDED(rv)) {
|
if (NS_SUCCEEDED(rv)) {
|
||||||
nsCAutoString nativePath;
|
nsCAutoString nativePath;
|
||||||
rv = mProfileDir->GetNativePath(nativePath);
|
rv = mProfileDir->GetNativePath(nativePath);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче