Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-28 21:28:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

#36965: make prefs use nsIFile - first part is to add APIs that will eventually replace GetFilePref

Browse Source 
r=conrad@ingress.com
This commit is contained in:
alecf%netscape.com 2000-07-31 20:27:22 +00:00
parent 98f64a1abf
commit 38488feb83
2 changed files with 41 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/libpref/public/nsIPref.idl
View File

@ -21,6 +21,7 @@
*/
#include "nsISupports.idl"
#include "nsILocalFile.idl"
%{C++
#include "jsapi.h"
@ -49,7 +50,7 @@ typedef void (*PrefEnumerationFunc)(const char *, void *);
native PrefChangedFunc(PrefChangedFunc);
native PrefEnumerationFunc(PrefEnumerationFunc);
interface nsIFileSpec;
interface nsIFileSpec;
[scriptable, uuid(a22ad7b0-ca86-11d1-a9a4-00805f8a7ac4)]
interface nsIPref : nsISupports {
@ -123,6 +124,8 @@ interface nsIPref : nsISupports {
nsIFileSpec GetFilePref(in string pref);
void SetFilePref(in string pref, in nsIFileSpec value, in boolean setDefault);
nsILocalFile getFileXPref(in string pref);
void setFileXPref(in string pref, in nsILocalFile value);
/* pref attributes */
boolean PrefIsLocked(in string pref);

59
modules/libpref/src/nsPref.cpp
View File

@ -557,6 +557,7 @@ NS_IMETHODIMP nsPref::ResetPrefs()
NS_IMETHODIMP nsPref::ShutDown()
//----------------------------------------------------------------------------------------
{
printf("PREF_Cleanup()\n");
PREF_Cleanup();
return NS_OK;
} // nsPref::ShutDown
@ -716,17 +717,7 @@ NS_IMETHODIMP nsPref::SetCharPref(const char *pref,const char* value)
NS_IMETHODIMP nsPref::SetUnicharPref(const char *pref, const PRUnichar *value)
{
if (NS_FAILED(SecurePrefCheck(pref))) return NS_ERROR_FAILURE;
nsresult rv;
nsAutoString str(value);
char *utf8String = str.ToNewUTF8String();
if (!utf8String) return NS_ERROR_OUT_OF_MEMORY;
rv = SetCharPref(pref, utf8String);
nsCRT::free(utf8String);
return rv;
return SetCharPref(pref, NS_ConvertUCS2toUTF8(value));
}
NS_IMETHODIMP nsPref::SetIntPref(const char *pref,PRInt32 value)
@ -789,17 +780,7 @@ NS_IMETHODIMP nsPref::SetDefaultUnicharPref(const char *pref,
const PRUnichar *value)
{
if (NS_FAILED(SecurePrefCheck(pref))) return NS_ERROR_FAILURE;
nsresult rv;
nsAutoString str(value);
char *utf8String = str.ToNewUTF8String();
if (!utf8String) return NS_ERROR_OUT_OF_MEMORY;
rv = SetDefaultCharPref(pref, utf8String);
nsCRT::free(utf8String);
return NS_OK;
return SetDefaultCharPref(pref, NS_ConvertUCS2toUTF8(value));
}
NS_IMETHODIMP nsPref::SetDefaultIntPref(const char *pref,PRInt32 value)
@ -1044,6 +1025,40 @@ NS_IMETHODIMP nsPref::SetFilePref(const char *pref_name,
return _convertRes(rv);
}
NS_IMETHODIMP
nsPref::GetFileXPref(const char *aPref, nsILocalFile ** aResult)
{
nsresult rv;
nsCOMPtr<nsILocalFile> file = do_CreateInstance(NS_LOCAL_FILE_PROGID, &rv);
NS_ENSURE_SUCCESS(rv, rv);
nsXPIDLCString descriptorString;
rv = CopyCharPref(aPref, getter_Copies(descriptorString));
if (NS_FAILED(rv)) return rv;
rv = file->SetPersistentDescriptor(descriptorString);
NS_ENSURE_SUCCESS(rv, rv);
*aResult = file;
NS_ADDREF(*aResult);
return NS_OK;
}
NS_IMETHODIMP
nsPref::SetFileXPref(const char *aPref, nsILocalFile *aValue)
{
nsresult rv;
nsXPIDLCString descriptorString;
rv = aValue->GetPersistentDescriptor(getter_Copies(descriptorString));
NS_ENSURE_SUCCESS(rv, rv);
rv = SetCharPref(aPref, descriptorString);
NS_ENSURE_SUCCESS(rv, rv);
return NS_OK;
}
/*
* Pref access without security check - these are here
* to support nsScriptSecurityManager.