mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

#31136 (Rename prefs from "browser.xxx" to "browser.display.xxx"). Final and trivial touch to the larger fix from mcafee.

This commit is contained in:
pierre%netscape.com 2000-06-22 05:41:11 +00:00
Родитель 7193e676db
Коммит 06405d62b3
2 изменённых файлов: 4 добавлений и 32 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

18
layout/base/nsPresContext.cpp
Просмотреть файл

@ -141,15 +141,8 @@ nsPresContext::~nsPresContext()
// Unregister preference callbacks // Unregister preference callbacks
if (mPrefs) { if (mPrefs) {
mPrefs->UnregisterCallback("browser.display.screen_resolution", PrefChangedCallback, (void*)this);
mPrefs->UnregisterCallback("browser.display.use_document_fonts", PrefChangedCallback, (void*)this);
mPrefs->UnregisterCallback("browser.display.use_document_colors", PrefChangedCallback, (void*)this);
mPrefs->UnregisterCallback("browser.display.background_color", PrefChangedCallback, (void*)this);
mPrefs->UnregisterCallback("browser.display.foreground_color", PrefChangedCallback, (void*)this);
mPrefs->UnregisterCallback("browser.display.base_font_scaler", PrefChangedCallback, (void*)this);
mPrefs->UnregisterCallback("browser.display.wfe.use_windows_colors", PrefChangedCallback, (void*)this);
mPrefs->UnregisterCallback("font.", PrefChangedCallback, (void*)this); mPrefs->UnregisterCallback("font.", PrefChangedCallback, (void*)this);
mPrefs->UnregisterCallback("browser.display.direction", PrefChangedCallback, (void*)this); mPrefs->UnregisterCallback("browser.display.", PrefChangedCallback, (void*)this);
} }
} }
@ -331,15 +324,8 @@ nsPresContext::Init(nsIDeviceContext* aDeviceContext)
mPrefs = do_GetService(NS_PREF_PROGID); mPrefs = do_GetService(NS_PREF_PROGID);
if (mPrefs) { if (mPrefs) {
// Register callbacks so we're notified when the preferences change // Register callbacks so we're notified when the preferences change
mPrefs->RegisterCallback("browser.display.screen_resolution", PrefChangedCallback, (void*)this);
mPrefs->RegisterCallback("browser.display.use_document_fonts", PrefChangedCallback, (void*)this);
mPrefs->RegisterCallback("browser.display.use_document_colors", PrefChangedCallback, (void*)this);
mPrefs->RegisterCallback("browser.display.background_color", PrefChangedCallback, (void*)this);
mPrefs->RegisterCallback("browser.display.foreground_color", PrefChangedCallback, (void*)this);
mPrefs->RegisterCallback("browser.display.base_font_scaler", PrefChangedCallback, (void*)this);
mPrefs->RegisterCallback("browser.display.wfe.use_windows_colors", PrefChangedCallback, (void*)this);
mPrefs->RegisterCallback("font.", PrefChangedCallback, (void*)this); mPrefs->RegisterCallback("font.", PrefChangedCallback, (void*)this);
mPrefs->RegisterCallback("browser.display.direction", PrefChangedCallback, (void*)this); mPrefs->RegisterCallback("browser.display.", PrefChangedCallback, (void*)this);
// Initialize our state from the user preferences // Initialize our state from the user preferences
GetUserPreferences(); GetUserPreferences();

18
layout/base/src/nsPresContext.cpp
Просмотреть файл

@ -141,15 +141,8 @@ nsPresContext::~nsPresContext()
// Unregister preference callbacks // Unregister preference callbacks
if (mPrefs) { if (mPrefs) {
mPrefs->UnregisterCallback("browser.display.screen_resolution", PrefChangedCallback, (void*)this);
mPrefs->UnregisterCallback("browser.display.use_document_fonts", PrefChangedCallback, (void*)this);
mPrefs->UnregisterCallback("browser.display.use_document_colors", PrefChangedCallback, (void*)this);
mPrefs->UnregisterCallback("browser.display.background_color", PrefChangedCallback, (void*)this);
mPrefs->UnregisterCallback("browser.display.foreground_color", PrefChangedCallback, (void*)this);
mPrefs->UnregisterCallback("browser.display.base_font_scaler", PrefChangedCallback, (void*)this);
mPrefs->UnregisterCallback("browser.display.wfe.use_windows_colors", PrefChangedCallback, (void*)this);
mPrefs->UnregisterCallback("font.", PrefChangedCallback, (void*)this); mPrefs->UnregisterCallback("font.", PrefChangedCallback, (void*)this);
mPrefs->UnregisterCallback("browser.display.direction", PrefChangedCallback, (void*)this); mPrefs->UnregisterCallback("browser.display.", PrefChangedCallback, (void*)this);
} }
} }
@ -331,15 +324,8 @@ nsPresContext::Init(nsIDeviceContext* aDeviceContext)
mPrefs = do_GetService(NS_PREF_PROGID); mPrefs = do_GetService(NS_PREF_PROGID);
if (mPrefs) { if (mPrefs) {
// Register callbacks so we're notified when the preferences change // Register callbacks so we're notified when the preferences change
mPrefs->RegisterCallback("browser.display.screen_resolution", PrefChangedCallback, (void*)this);
mPrefs->RegisterCallback("browser.display.use_document_fonts", PrefChangedCallback, (void*)this);
mPrefs->RegisterCallback("browser.display.use_document_colors", PrefChangedCallback, (void*)this);
mPrefs->RegisterCallback("browser.display.background_color", PrefChangedCallback, (void*)this);
mPrefs->RegisterCallback("browser.display.foreground_color", PrefChangedCallback, (void*)this);
mPrefs->RegisterCallback("browser.display.base_font_scaler", PrefChangedCallback, (void*)this);
mPrefs->RegisterCallback("browser.display.wfe.use_windows_colors", PrefChangedCallback, (void*)this);
mPrefs->RegisterCallback("font.", PrefChangedCallback, (void*)this); mPrefs->RegisterCallback("font.", PrefChangedCallback, (void*)this);
mPrefs->RegisterCallback("browser.display.direction", PrefChangedCallback, (void*)this); mPrefs->RegisterCallback("browser.display.", PrefChangedCallback, (void*)this);
// Initialize our state from the user preferences // Initialize our state from the user preferences
GetUserPreferences(); GetUserPreferences();