diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2003-12-30 05:05:09 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2003-12-30 05:05:09 +0800 |
| commit | c76b79acb1dd84aec4b91bae8841099699a38139 (patch) | |
| tree | 2b0b28700be1db98ad314b12e00b4d76d6885fee /src/ephy-tab.c | |
| parent | 6ca9d693750a2b0807670b0072ed5d162e12fea0 (diff) | |
| download | gsoc2013-epiphany-c76b79acb1dd84aec4b91bae8841099699a38139.tar gsoc2013-epiphany-c76b79acb1dd84aec4b91bae8841099699a38139.tar.gz gsoc2013-epiphany-c76b79acb1dd84aec4b91bae8841099699a38139.tar.bz2 gsoc2013-epiphany-c76b79acb1dd84aec4b91bae8841099699a38139.tar.lz gsoc2013-epiphany-c76b79acb1dd84aec4b91bae8841099699a38139.tar.xz gsoc2013-epiphany-c76b79acb1dd84aec4b91bae8841099699a38139.tar.zst gsoc2013-epiphany-c76b79acb1dd84aec4b91bae8841099699a38139.zip | |
Unified return type of ephy_embed_shell_get_X to be GObject *. Fixed all
2003-12-29 Christian Persch <chpe@cvs.gnome.org>
* embed/ephy-embed-shell.c: (ephy_embed_shell_get_favicon_cache),
(ephy_embed_shell_get_global_history),
(ephy_embed_shell_get_downloader_view),
(ephy_embed_shell_get_embed_single),
(ephy_embed_shell_get_encodings), (ephy_embed_shell_check_mime),
(ephy_embed_shell_class_init):
* embed/ephy-embed-shell.h:
* embed/mozilla/ContentHandler.cpp:
* embed/mozilla/EphyHeaderSniffer.cpp:
* embed/mozilla/GlobalHistory.cpp:
* embed/mozilla/mozilla-notifiers.cpp:
* src/bookmarks/ephy-bookmarks.c: (compute_lower_fav),
(ephy_setup_history_notifiers):
* src/ephy-completion-model.c: (ephy_completion_model_init):
* src/ephy-shell.c: (ephy_shell_get_history_window):
* src/ephy-tab.c: (ephy_tab_set_icon_address),
(ephy_tab_address_cb), (ephy_tab_zoom_changed_cb):
* src/ephy-toolbars-model.c: (impl_get_item_id):
* src/prefs-dialog.c: (setup_font_combo),
(prefs_clear_cache_button_clicked_cb):
Unified return type of ephy_embed_shell_get_X to be GObject *.
Fixed all callers.
Diffstat (limited to 'src/ephy-tab.c')
| -rw-r--r-- | src/ephy-tab.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/ephy-tab.c b/src/ephy-tab.c index e40e51207..25c7f0e4e 100644 --- a/src/ephy-tab.c +++ b/src/ephy-tab.c @@ -24,7 +24,6 @@ #endif #include "ephy-tab.h" -#include "ephy-shell.h" #include "eel-gconf-extensions.h" #include "ephy-prefs.h" #include "ephy-embed-factory.h" @@ -36,6 +35,9 @@ #include "ephy-zoom.h" #include "ephy-favicon-cache.h" #include "ephy-embed-persist.h" +#include "ephy-history.h" +#include "ephy-embed-shell.h" +#include "ephy-shell.h" #include <glib/gi18n.h> #include <libgnomevfs/gnome-vfs-uri.h> @@ -555,8 +557,8 @@ ephy_tab_set_icon_address (EphyTab *tab, const char *address) if (tab->priv->icon_address) { eb = ephy_shell_get_bookmarks (ephy_shell); - history = ephy_embed_shell_get_global_history - (EPHY_EMBED_SHELL (ephy_shell)); + history = EPHY_HISTORY + (ephy_embed_shell_get_global_history (embed_shell)); ephy_bookmarks_set_icon (eb, tab->priv->address, tab->priv->icon_address); ephy_history_set_icon (history, tab->priv->address, @@ -613,8 +615,8 @@ ephy_tab_address_cb (EphyEmbed *embed, const char *address, EphyTab *tab) GValue value = { 0, }; float zoom = 1.0, current_zoom; - history = ephy_embed_shell_get_global_history - (EPHY_EMBED_SHELL (ephy_shell)); + history = EPHY_HISTORY + (ephy_embed_shell_get_global_history (embed_shell)); host = ephy_history_get_host (history, address); if (host != NULL && ephy_node_get_property @@ -654,8 +656,8 @@ ephy_tab_zoom_changed_cb (EphyEmbed *embed, float zoom, EphyTab *tab) EphyHistory *history; EphyNode *host; GValue value = { 0, }; - history = ephy_embed_shell_get_global_history - (EPHY_EMBED_SHELL (ephy_shell)); + history = EPHY_HISTORY + (ephy_embed_shell_get_global_history (embed_shell)); host = ephy_history_get_host (history, address); if (host != NULL) |