diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2004-12-02 23:16:41 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2004-12-02 23:16:41 +0800 |
| commit | 37cc7f0bb5f9e4e7257ff9b7106dd92467590d43 (patch) | |
| tree | d2c21062ffb30b383187311a657c26148c5ddf28 /embed/mozilla/EphyUtils.cpp | |
| parent | 2f0a4969602af118edfcb2959d422b7c03e022b0 (diff) | |
| download | gsoc2013-epiphany-37cc7f0bb5f9e4e7257ff9b7106dd92467590d43.tar gsoc2013-epiphany-37cc7f0bb5f9e4e7257ff9b7106dd92467590d43.tar.gz gsoc2013-epiphany-37cc7f0bb5f9e4e7257ff9b7106dd92467590d43.tar.bz2 gsoc2013-epiphany-37cc7f0bb5f9e4e7257ff9b7106dd92467590d43.tar.lz gsoc2013-epiphany-37cc7f0bb5f9e4e7257ff9b7106dd92467590d43.tar.xz gsoc2013-epiphany-37cc7f0bb5f9e4e7257ff9b7106dd92467590d43.tar.zst gsoc2013-epiphany-37cc7f0bb5f9e4e7257ff9b7106dd92467590d43.zip | |
Update bookmarks from HTTP 301. Fixes bug #126312.
2004-12-02 Christian Persch <chpe@cvs.gnome.org>
* 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.
Diffstat (limited to 'embed/mozilla/EphyUtils.cpp')
| -rw-r--r-- | embed/mozilla/EphyUtils.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
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; } |