diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp index 118eeb64b4e..e5eb4bf477c 100644 --- a/modules/libpref/Preferences.cpp +++ b/modules/libpref/Preferences.cpp @@ -960,7 +960,6 @@ Preferences::WritePrefFile(nsIFile* aFile) memset(valueArray, 0, gHashTable->EntryCount() * sizeof(char*)); pref_saveArgs saveArgs; saveArgs.prefArray = valueArray; - saveArgs.saveTypes = SAVE_ALL; // get the lines that we're supposed to be writing to the file PL_DHashTableEnumerate(gHashTable, pref_savePref, &saveArgs); diff --git a/modules/libpref/prefapi.cpp b/modules/libpref/prefapi.cpp index 8b603e25b1f..e5428476ec8 100644 --- a/modules/libpref/prefapi.cpp +++ b/modules/libpref/prefapi.cpp @@ -343,13 +343,8 @@ pref_savePref(PLDHashTable *table, PLDHashEntryHdr *heh, uint32_t i, void *arg) pref->flags & PREF_STICKY_DEFAULT)) { sourcePref = &pref->userPref; } else { - if (argData->saveTypes == SAVE_ALL_AND_DEFAULTS) { - prefPrefix.AssignLiteral("pref(\""); - sourcePref = &pref->defaultPref; - } - else - // do not save default prefs that haven't changed - return PL_DHASH_NEXT; + // do not save default prefs that haven't changed + return PL_DHASH_NEXT; } // strings are in quotes! diff --git a/modules/libpref/prefapi_private_data.h b/modules/libpref/prefapi_private_data.h index 82141adcefd..c288edcfc81 100644 --- a/modules/libpref/prefapi_private_data.h +++ b/modules/libpref/prefapi_private_data.h @@ -19,12 +19,9 @@ class PrefSetting; } } -enum pref_SaveTypes { SAVE_NONSHARED, SAVE_SHARED, SAVE_ALL, SAVE_ALL_AND_DEFAULTS }; - // Passed as the arg to pref_savePref struct pref_saveArgs { char **prefArray; - pref_SaveTypes saveTypes; }; PLDHashOperator