Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-03 07:01:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

adding pref changes for bug 204255, r=ccarlen, sr=alecf, a=sspitzer

Browse Source
This commit is contained in:
darin%netscape.com 2003-05-21 21:14:29 +00:00
parent ba917b73d4
commit 257789be07
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/libpref/src/Makefile.in
View File

@ -47,8 +47,7 @@ REQUIRES = xpcom \
$(NULL)
ifdef MOZ_PROFILESHARING
REQUIRES += transmngr \
ipcd \
REQUIRES += ipcd \
profilesharingsetup \
$(NULL)
endif

12
modules/libpref/src/nsSharedPrefHandler.cpp
View File

@ -118,7 +118,7 @@ nsresult nsSharedPrefHandler::OnSessionBegin()
// read in our data. The transaction service holds a lock on
// our data file during our reply.
rv = mTransService->Attach(kPrefsTSQueueName, this, PR_TRUE);
NS_ASSERTION(NS_SUCCEEDED(rv), "tmITransactionService::Attach() failed");
NS_ASSERTION(NS_SUCCEEDED(rv), "ipcITransactionService::Attach() failed");
if (NS_SUCCEEDED(rv))
mSessionActive = PR_TRUE;
@ -132,7 +132,7 @@ nsresult nsSharedPrefHandler::OnSessionEnd()
NS_ENSURE_SUCCESS(rv, rv);
rv = mTransService->Detach(kPrefsTSQueueName);
NS_ASSERTION(NS_SUCCEEDED(rv), "tmITransactionService::Detach() failed");
NS_ASSERTION(NS_SUCCEEDED(rv), "ipcITransactionService::Detach() failed");
mSessionActive = PR_FALSE;
@ -148,7 +148,7 @@ nsresult nsSharedPrefHandler::OnSavePrefs()
// write out our data. The transaction service holds a lock on
// our data file during our reply.
rv = mTransService->Flush(kPrefsTSQueueName, PR_TRUE);
NS_ASSERTION(NS_SUCCEEDED(rv), "tmITransactionService::Flush() failed");
NS_ASSERTION(NS_SUCCEEDED(rv), "ipcITransactionService::Flush() failed");
return NS_OK;
}
@ -202,7 +202,7 @@ nsresult nsSharedPrefHandler::OnPrefChanged(PrefAction action,
NS_ASSERTION(NS_SUCCEEDED(rv), "OnPrefChanged: outMsg failed");
if (NS_SUCCEEDED(rv)) {
rv = mTransService->PostTransaction(kPrefsTSQueueName, outMsg.GetBuffer(), outMsg.GetSize());
NS_ASSERTION(NS_SUCCEEDED(rv), "tmITransactionService::PostTransaction() failed");
NS_ASSERTION(NS_SUCCEEDED(rv), "ipcITransactionService::PostTransaction() failed");
}
return rv;
}
@ -279,10 +279,10 @@ nsresult nsSharedPrefHandler::EnsureTransactionService()
// nsSharedPrefHandler::nsISupports
//*****************************************************************************
NS_IMPL_ISUPPORTS1(nsSharedPrefHandler, tmITransactionObserver)
NS_IMPL_ISUPPORTS1(nsSharedPrefHandler, ipcITransactionObserver)
//*****************************************************************************
// nsSharedPrefHandler::tmITransactionObserver
// nsSharedPrefHandler::ipcITransactionObserver
//*****************************************************************************
NS_IMETHODIMP nsSharedPrefHandler::OnTransactionAvailable(PRUint32 aQueueID, const PRUint8 *aData, PRUint32 aDataLen)

9
modules/libpref/src/nsSharedPrefHandler.h
View File

@ -40,7 +40,8 @@
#define nsSharedPrefHandler_h__
// Interfaces needed
#include "tmITransactionService.h"
#include "ipcITransactionService.h"
#include "ipcITransactionObserver.h"
// Includes
#include "nsCOMPtr.h"
@ -57,12 +58,12 @@ class nsPrefService;
// nsSharedPrefHandler
// --------------------------------------------------------------------------------------
class nsSharedPrefHandler : public tmITransactionObserver
class nsSharedPrefHandler : public ipcITransactionObserver
{
friend nsresult NS_CreateSharedPrefHandler(nsPrefService*);
NS_DECL_ISUPPORTS
NS_DECL_TMITRANSACTIONOBSERVER
NS_DECL_IPCITRANSACTIONOBSERVER
public:
nsresult OnSessionBegin();
@ -90,7 +91,7 @@ protected:
protected:
nsPrefService *mPrefService; // weak ref
nsCOMPtr<tmITransactionService> mTransService;
nsCOMPtr<ipcITransactionService> mTransService;
const nsCString mPrefsTSQueueName;
PRPackedBool mSessionActive;