Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 193332: backend fix to let about:config to remove reset prefs with no default, r+sr=darin

Browse Source
This commit is contained in:
ajschult%verizon.net 2006-06-12 00:47:26 +00:00
parent 6af592f97a
commit 84b26f6769
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
modules/libpref/src/prefapi.cpp
View File

@ -561,6 +561,15 @@ PREF_ClearUserPref(const char *pref_name)
if (pref && PREF_HAS_USER_VALUE(pref))
{
pref->flags &= ~PREF_USERSET;
if ((pref->flags & PREF_INT &&
pref->defaultPref.intVal == ((PRInt32) BOGUS_DEFAULT_INT_PREF_VALUE)) ||
(pref->flags & PREF_BOOL &&
pref->defaultPref.boolVal == ((PRBool) BOGUS_DEFAULT_BOOL_PREF_VALUE)) ||
(pref->flags & PREF_STRING && !pref->defaultPref.stringVal)) {
PL_DHashTableOperate(&gHashTable, pref_name, PL_DHASH_REMOVE);
}
if (gCallbacksEnabled)
pref_DoCallback(pref_name);
gDirty = PR_TRUE;
@ -575,20 +584,24 @@ pref_ClearUserPref(PLDHashTable *table, PLDHashEntryHdr *he, PRUint32,
{
PrefHashEntry *pref = NS_STATIC_CAST(PrefHashEntry*, he);
PLDHashOperator nextOp = PL_DHASH_NEXT;
if (PREF_HAS_USER_VALUE(pref))
{
// Note that we're not unhashing the pref. A pref which has both
// a user value and a default value needs to remain. Currently,
// there isn't a way to determine that a pref has a default value,
// other than comparing its value to BOGUS_DEFAULT_XXX_PREF_VALUE.
// This needs to be fixed. If we could positively identify a pref
// as not having a set default value here, we could unhash it.
pref->flags &= ~PREF_USERSET;
if ((pref->flags & PREF_INT &&
pref->defaultPref.intVal == ((PRInt32) BOGUS_DEFAULT_INT_PREF_VALUE)) ||
(pref->flags & PREF_BOOL &&
pref->defaultPref.boolVal == ((PRBool) BOGUS_DEFAULT_BOOL_PREF_VALUE)) ||
(pref->flags & PREF_STRING && !pref->defaultPref.stringVal)) {
nextOp = PL_DHASH_REMOVE;
}
if (gCallbacksEnabled)
pref_DoCallback(pref->key);
}
return PL_DHASH_NEXT;
return nextOp;
}
nsresult