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.h | |
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.h')
-rw-r--r-- | embed/mozilla/EphyUtils.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/embed/mozilla/EphyUtils.h b/embed/mozilla/EphyUtils.h index 90057e1d5..2977dda74 100644 --- a/embed/mozilla/EphyUtils.h +++ b/embed/mozilla/EphyUtils.h @@ -33,9 +33,15 @@ namespace EphyUtils { nsresult GetIOService (nsIIOService **ioService); - nsresult NewURI (nsIURI **result, const nsAString &spec); - - nsresult NewURI (nsIURI **result, const nsACString &spec); + nsresult NewURI (nsIURI **result, + const nsAString &spec, + const char *charset = nsnull, + nsIURI *baseURI = nsnull); + + nsresult NewURI (nsIURI **result, + const nsACString &spec, + const char *charset = nsnull, + nsIURI *baseURI = nsnull); GtkWidget *FindEmbed (nsIDOMWindow *aDOMWindow); |