Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-05-13 08:57:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove link dependancy on prefs by using prefs service

Browse Source
This commit is contained in:
alecf%netscape.com 1999-09-02 04:01:42 +00:00
parent c37a1805c8
commit 46d5933849
3 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
extensions/cookie/Makefile.in
View File

@ -59,8 +59,9 @@ endif
EXTRA_DSO_LDOPTS =\
-L$(DIST)/bin \
$(NSPR_LIBS) \
-lxpcom \
-lsecfree \
-lpref \
$(NULL)
include $(topsrcdir)/config/rules.mk

1
extensions/cookie/makefile.win
View File

@ -65,7 +65,6 @@ LLIBS = \
!else
$(DIST)\lib\netwerk.lib \
!endif
$(DIST)\lib\xppref32.lib \
$(DIST)\lib\secfreenav32.lib \
$(HASHLIBS)

24
extensions/cookie/nsCookie.cpp
View File

@ -29,6 +29,8 @@
#include "nsIURL.h"
#include "nsIStringBundle.h"
#include "nsVoidArray.h"
#include "nsIPref.h"
#include "prefapi.h"
extern "C" {
@ -731,7 +733,9 @@ cookie_GetWarningPref() {
MODULE_PRIVATE int PR_CALLBACK
cookie_BehaviorPrefChanged(const char * newpref, void * data) {
PRInt32 n;
if ((PREF_OK != PREF_GetIntPref(cookie_behaviorPref, &n))) {
nsresult rv;
NS_WITH_SERVICE(nsIPref, prefs, "component://netscape/preferences", &rv);
if (NS_FAILED(prefs->GetIntPref(cookie_behaviorPref, &n))) {
cookie_SetBehaviorPref(COOKIE_Accept);
} else {
cookie_SetBehaviorPref((cookie_BehaviorEnum)n);
@ -742,7 +746,9 @@ cookie_BehaviorPrefChanged(const char * newpref, void * data) {
MODULE_PRIVATE int PR_CALLBACK
cookie_WarningPrefChanged(const char * newpref, void * data) {
PRBool x;
if ((PREF_OK != PREF_GetBoolPref(cookie_warningPref, &x))) {
nsresult rv;
NS_WITH_SERVICE(nsIPref, prefs, "component://netscape/preferences", &rv);
if (NS_FAILED(prefs->GetBoolPref(cookie_warningPref, &x))) {
x = PR_FALSE;
}
cookie_SetWarningPref(x);
@ -788,18 +794,20 @@ PUBLIC void
COOKIE_RegisterCookiePrefCallbacks(void) {
PRInt32 n;
PRBool x;
if ((PREF_OK != PREF_GetIntPref(cookie_behaviorPref, &n))) {
nsresult rv;
NS_WITH_SERVICE(nsIPref, prefs, "component://netscape/preferences", &rv);
if (NS_FAILED(prefs->GetIntPref(cookie_behaviorPref, &n))) {
cookie_SetBehaviorPref(COOKIE_Accept);
} else {
cookie_SetBehaviorPref((cookie_BehaviorEnum)n);
}
cookie_SetBehaviorPref((cookie_BehaviorEnum)n);
PREF_RegisterCallback(cookie_behaviorPref, cookie_BehaviorPrefChanged, NULL);
if ((PREF_OK != PREF_GetBoolPref(cookie_warningPref, &x))) {
prefs->RegisterCallback(cookie_behaviorPref, cookie_BehaviorPrefChanged, NULL);
if (NS_FAILED(prefs->GetBoolPref(cookie_warningPref, &x))) {
x = PR_FALSE;
}
cookie_SetWarningPref(x);
PREF_RegisterCallback(cookie_warningPref, cookie_WarningPrefChanged, NULL);
prefs->RegisterCallback(cookie_warningPref, cookie_WarningPrefChanged, NULL);
}
/* returns PR_TRUE if authorization is required
@ -1244,7 +1252,9 @@ cookie_SetCookieString(char * curURL, char * setCookieHeader, time_t timeToExpir
* So only do it if the restrictCookieDomains pref is PR_TRUE.
*
*/
if ( PREF_GetBoolPref(cookie_strictDomainsPref, &pref_scd) < 0 ) {
nsresult rv;
NS_WITH_SERVICE(nsIPref, prefs, "component://netscape/preferences", &rv);
if (NS_FAILED(prefs->GetBoolPref(cookie_strictDomainsPref, &pref_scd))) {
pref_scd = PR_FALSE;
}
if ( pref_scd == PR_TRUE ) {