mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-10 11:55:49 +00:00
fix bug 15572, clean up build warnings, reviewed slamm
This commit is contained in:
parent
e985fb06bf
commit
b216201313
@ -1532,6 +1532,7 @@ COOKIE_SetCookieString(char * curURL, char * setCookieHeader) {
|
||||
cookie_SetCookieString(curURL, setCookieHeader, 0);
|
||||
}
|
||||
|
||||
#ifdef later // We need to come back and fix this. - Neeti
|
||||
/* Determines whether the inlineHost is in the same domain as the currentHost.
|
||||
* For use with rfc 2109 compliance/non-compliance.
|
||||
*/
|
||||
@ -1574,6 +1575,7 @@ cookie_SameDomain(char * currentHost, char * inlineHost) {
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
/* This function wrapper wraps COOKIE_SetCookieString for the purposes of
|
||||
* determining whether or not a cookie is inline (we need the URL struct,
|
||||
|
@ -150,28 +150,6 @@ CookieViewerImpl::GetPermissionValue(char** aValue)
|
||||
return res;
|
||||
}
|
||||
|
||||
static void DOMWindowToWebShellWindow(
|
||||
nsIDOMWindow *DOMWindow,
|
||||
nsCOMPtr<nsIWebShellWindow> *webWindow)
|
||||
{
|
||||
if (!DOMWindow) {
|
||||
return; // with webWindow unchanged -- its constructor gives it a null ptr
|
||||
}
|
||||
nsCOMPtr<nsIScriptGlobalObject> globalScript(do_QueryInterface(DOMWindow));
|
||||
nsCOMPtr<nsIWebShell> webshell, rootWebshell;
|
||||
if (globalScript) {
|
||||
globalScript->GetWebShell(getter_AddRefs(webshell));
|
||||
}
|
||||
if (webshell) {
|
||||
webshell->GetRootWebShellEvenIfChrome(*getter_AddRefs(rootWebshell));
|
||||
}
|
||||
if (rootWebshell) {
|
||||
nsCOMPtr<nsIWebShellContainer> webshellContainer;
|
||||
rootWebshell->GetContainer(*getter_AddRefs(webshellContainer));
|
||||
*webWindow = do_QueryInterface(webshellContainer);
|
||||
}
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
CookieViewerImpl::SetValue(const char* aValue, nsIDOMWindow* win)
|
||||
{
|
||||
|
@ -147,28 +147,6 @@ SignonViewerImpl::GetNocaptureValue(char** aValue)
|
||||
return res;
|
||||
}
|
||||
|
||||
static void DOMWindowToWebShellWindow(
|
||||
nsIDOMWindow *DOMWindow,
|
||||
nsCOMPtr<nsIWebShellWindow> *webWindow)
|
||||
{
|
||||
if (!DOMWindow) {
|
||||
return; // with webWindow unchanged -- its constructor gives it a null ptr
|
||||
}
|
||||
nsCOMPtr<nsIScriptGlobalObject> globalScript(do_QueryInterface(DOMWindow));
|
||||
nsCOMPtr<nsIWebShell> webshell, rootWebshell;
|
||||
if (globalScript) {
|
||||
globalScript->GetWebShell(getter_AddRefs(webshell));
|
||||
}
|
||||
if (webshell) {
|
||||
webshell->GetRootWebShellEvenIfChrome(*getter_AddRefs(rootWebshell));
|
||||
}
|
||||
if (rootWebshell) {
|
||||
nsCOMPtr<nsIWebShellContainer> webshellContainer;
|
||||
rootWebshell->GetContainer(*getter_AddRefs(webshellContainer));
|
||||
*webWindow = do_QueryInterface(webshellContainer);
|
||||
}
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
SignonViewerImpl::SetValue(const char* aValue, nsIDOMWindow* win)
|
||||
{
|
||||
|
@ -545,13 +545,17 @@ SI_SetCharPref(const char * prefname, const char * prefvalue);
|
||||
extern void
|
||||
SI_GetCharPref(const char * prefname, char** aPrefvalue);
|
||||
|
||||
#ifdef AutoCapture
|
||||
static const char *pref_captureForms = "wallet.captureForms";
|
||||
#endif
|
||||
static const char *pref_WalletNotified = "wallet.Notified";
|
||||
static const char *pref_WalletKeyFileName = "wallet.KeyFileName";
|
||||
static const char *pref_WalletSchemaValueFileName = "wallet.SchemaValueFileName";
|
||||
static const char *pref_WalletServer = "wallet.Server";
|
||||
|
||||
#ifdef AutoCapture
|
||||
PRIVATE PRBool wallet_captureForms = PR_FALSE;
|
||||
#endif
|
||||
PRIVATE PRBool wallet_Notified = PR_FALSE;
|
||||
PRIVATE char * wallet_Server = nsnull;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user