From aff52b7588b3fe6eb92da56ad016cf1f8722d046 Mon Sep 17 00:00:00 2001
From: "gavin%gavinsharp.com"
 <gavin%gavinsharp.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 15 May 2006 17:17:04 +0000
Subject: [PATCH] Bug 337970: don't pass null to RequestCharset, r+sr=bzbarsky

git-svn-id: svn://10.0.0.236/trunk@196537 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/content/html/document/src/nsHTMLDocument.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mozilla/content/html/document/src/nsHTMLDocument.cpp b/mozilla/content/html/document/src/nsHTMLDocument.cpp
index 01bc9d623b8..8aac79fd5fe 100644
--- a/mozilla/content/html/document/src/nsHTMLDocument.cpp
+++ b/mozilla/content/html/document/src/nsHTMLDocument.cpp
@@ -571,10 +571,11 @@ nsHTMLDocument::TryBookmarkCharset(nsIDocShell* aDocShell,
   PRBool wantCharset;         // ignored for now
   nsCAutoString charset;
   nsCOMPtr<nsIWebNavigation> webNav(do_QueryInterface(aDocShell));
+  nsCOMPtr<nsISupports> closure;
   nsresult rv = bookmarksResolver->RequestCharset(webNav,
                                                   aChannel,
                                                   &wantCharset,
-                                                  nsnull,
+                                                  getter_AddRefs(closure),
                                                   charset);
   if (NS_SUCCEEDED(rv) && !charset.IsEmpty()) {
     aCharset = charset;