From 37cc7f0bb5f9e4e7257ff9b7106dd92467590d43 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Thu, 2 Dec 2004 15:16:41 +0000 Subject: Update bookmarks from HTTP 301. Fixes bug #126312. 2004-12-02 Christian Persch * embed/ephy-history.c: (ephy_history_class_init): * embed/ephy-history.h: * embed/mozilla/EphyHistoryListener.cpp: * embed/mozilla/EphyHistoryListener.h: * embed/mozilla/EphyUtils.cpp: * embed/mozilla/EphyUtils.h: * embed/mozilla/GlobalHistory.cpp: * embed/mozilla/GlobalHistory.h: * embed/mozilla/Makefile.am: * src/bookmarks/ephy-bookmarks.c: (redirect_cb), (ephy_setup_history_notifiers): * src/ephy-window.c: (confirm_close_with_modified_forms), (ensure_window_group), (ephy_window_init): Update bookmarks from HTTP 301. Fixes bug #126312. --- embed/mozilla/EphyUtils.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'embed/mozilla/EphyUtils.cpp') diff --git a/embed/mozilla/EphyUtils.cpp b/embed/mozilla/EphyUtils.cpp index c8d296737..3a5407cb8 100644 --- a/embed/mozilla/EphyUtils.cpp +++ b/embed/mozilla/EphyUtils.cpp @@ -52,15 +52,23 @@ EphyUtils::GetIOService (nsIIOService **ioService) return rv; } -nsresult EphyUtils::NewURI (nsIURI **result, const nsAString &spec) +nsresult +EphyUtils::NewURI (nsIURI **result, + const nsAString &spec, + const char *charset, + nsIURI *baseURI) { nsEmbedCString cSpec; NS_UTF16ToCString (spec, NS_CSTRING_ENCODING_UTF8, cSpec); - return NewURI (result, cSpec); + return NewURI (result, cSpec, charset, baseURI); } -nsresult EphyUtils::NewURI (nsIURI **result, const nsACString &spec) +nsresult +EphyUtils::NewURI (nsIURI **result, + const nsACString &spec, + const char *charset, + nsIURI *baseURI) { nsresult rv; @@ -68,7 +76,7 @@ nsresult EphyUtils::NewURI (nsIURI **result, const nsACString &spec) rv = EphyUtils::GetIOService (getter_AddRefs (ioService)); NS_ENSURE_SUCCESS (rv, rv); - rv = ioService->NewURI (spec, nsnull, nsnull, result); + rv = ioService->NewURI (spec, charset, baseURI, result); return rv; } -- cgit v1.2.3