diff options
author | Marco Pesenti Gritti <marco@it.gnome.org> | 2003-07-13 16:52:36 +0800 |
---|---|---|
committer | Marco Pesenti Gritti <mpeseng@src.gnome.org> | 2003-07-13 16:52:36 +0800 |
commit | 9f70e82e7fd4d8888f55c63cf3eb911d27b0fbec (patch) | |
tree | 089536612813c5504f5fe5a35184e3ff23a8adcd /src/ephy-tab.c | |
parent | f73556913d8a794f6c8ed17a7664d0a2f61635da (diff) | |
download | gsoc2013-epiphany-9f70e82e7fd4d8888f55c63cf3eb911d27b0fbec.tar gsoc2013-epiphany-9f70e82e7fd4d8888f55c63cf3eb911d27b0fbec.tar.gz gsoc2013-epiphany-9f70e82e7fd4d8888f55c63cf3eb911d27b0fbec.tar.bz2 gsoc2013-epiphany-9f70e82e7fd4d8888f55c63cf3eb911d27b0fbec.tar.lz gsoc2013-epiphany-9f70e82e7fd4d8888f55c63cf3eb911d27b0fbec.tar.xz gsoc2013-epiphany-9f70e82e7fd4d8888f55c63cf3eb911d27b0fbec.tar.zst gsoc2013-epiphany-9f70e82e7fd4d8888f55c63cf3eb911d27b0fbec.zip |
2003-07-13 Marco Pesenti Gritti <marco@it.gnome.org>
* Makefile.am:
* configure.in:
* embed/Makefile.am:
* embed/ephy-embed-shell.c: (ephy_embed_shell_get_favicon_cache),
(impl_get_downloader_view):
* embed/ephy-embed-shell.h:
* embed/ephy-embed-single.c:
* embed/ephy-embed-single.h:
* embed/mozilla/ProgressListener.cpp:
* embed/mozilla/mozilla-embed.cpp:
* lib/Makefile.am:
* lib/ephy-langs.h:
* lib/ephy-node.c: (unref_signal_objects),
(ephy_node_signal_connect_object):
* plugins/Makefile.am:
* plugins/sample/Makefile.am:
* plugins/sample/sample.c: (bmk_added), (bmk_removed),
(bmk_changed), (switch_page_cb), (window_focus_in_cb),
(location_changed_cb), (tab_added_cb), (new_window_cb),
(plugin_init):
* src/Makefile.am:
* src/bookmarks/Makefile.am:
* src/bookmarks/ephy-bookmark-action.c:
(ephy_bookmark_action_sync_icon):
* src/bookmarks/ephy-bookmark-properties.c: (set_window_icon),
(ephy_bookmark_properties_init):
* src/bookmarks/ephy-bookmarks-editor.c: (provide_favicon),
(ephy_bookmarks_editor_init):
* src/bookmarks/ephy-bookmarks.c: (update_favorites_menus):
* src/bookmarks/ephy-topic-action.c: (build_bookmarks_menu):
* src/ephy-automation.c: (impl_ephy_automation_loadurl),
(impl_ephy_automation_quit), (impl_ephy_automation_load_session):
* src/ephy-favicon-action.c: (ephy_favicon_action_init):
* src/ephy-history-window.c: (confirmation_dialog_response_cb),
(provide_favicon):
* src/ephy-location-action.c: (connect_proxy):
* src/ephy-notebook.c: (sync_icon):
* src/ephy-shell.c: (ephy_shell_get_active_window),
(ephy_shell_get_session), (ephy_shell_get_autocompletion),
(ephy_shell_get_toolbars_model):
* src/ephy-shell.h:
* src/ephy-tab.c: (ephy_tab_net_state_cb), (ephy_tab_init),
(ephy_tab_get_action):
* src/ephy-tab.h:
* src/ephy-tabs-menu.c: (ephy_tabs_menu_update):
* src/ephy-window.c: (ephy_window_fullscreen),
(ephy_window_unfullscreen), (sync_tab_icon), (ephy_window_init),
(remove_from_session), (ephy_window_get_active_tab):
Diffstat (limited to 'src/ephy-tab.c')
-rw-r--r-- | src/ephy-tab.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/ephy-tab.c b/src/ephy-tab.c index df8a6f9c7..5d2056dcd 100644 --- a/src/ephy-tab.c +++ b/src/ephy-tab.c @@ -31,6 +31,8 @@ #include "ephy-notebook.h" #include "ephy-file-helpers.h" #include "ephy-zoom.h" +#include "session.h" +#include "ephy-favicon-cache.h" #include <bonobo/bonobo-i18n.h> #include <libgnomevfs/gnome-vfs-uri.h> @@ -753,7 +755,8 @@ ephy_tab_net_state_cb (EphyEmbed *embed, const char *uri, { /* tab load completed, save in session */ Session *s; - s = ephy_shell_get_session (ephy_shell); + + s = SESSION (ephy_shell_get_session (ephy_shell)); session_save (s, SESSION_CRASHED); ephy_tab_set_load_percent (tab, 0); @@ -1014,7 +1017,8 @@ ephy_tab_init (EphyTab *tab) G_CALLBACK (ephy_tab_favicon_cb), tab); - cache = ephy_embed_shell_get_favicon_cache (EPHY_EMBED_SHELL (ephy_shell)); + cache = EPHY_FAVICON_CACHE + (ephy_embed_shell_get_favicon_cache (EPHY_EMBED_SHELL (ephy_shell))); g_signal_connect_object (G_OBJECT (cache), "changed", G_CALLBACK (ephy_tab_icon_cache_changed_cb), tab, 0); @@ -1244,10 +1248,10 @@ ephy_tab_get_zoom (EphyTab *tab) return tab->priv->zoom; } -EggAction * +GObject * ephy_tab_get_action (EphyTab *tab) { g_return_val_if_fail (IS_EPHY_TAB (tab), NULL); - return tab->priv->action; + return G_OBJECT (tab->priv->action); } |