diff options
author | Xan Lopez <xan@src.gnome.org> | 2008-06-30 15:23:57 +0800 |
---|---|---|
committer | Xan Lopez <xan@src.gnome.org> | 2008-06-30 15:23:57 +0800 |
commit | d0ccaa5cfa129113f6359b1be98ef9cb0db3e8e4 (patch) | |
tree | 034c12aef5e4f93d60bea8aac738d23b7829ac02 | |
parent | 0238a377973ad82bd73e4e8f12a291b62359e9c1 (diff) | |
download | gsoc2013-epiphany-d0ccaa5cfa129113f6359b1be98ef9cb0db3e8e4.tar gsoc2013-epiphany-d0ccaa5cfa129113f6359b1be98ef9cb0db3e8e4.tar.gz gsoc2013-epiphany-d0ccaa5cfa129113f6359b1be98ef9cb0db3e8e4.tar.bz2 gsoc2013-epiphany-d0ccaa5cfa129113f6359b1be98ef9cb0db3e8e4.tar.lz gsoc2013-epiphany-d0ccaa5cfa129113f6359b1be98ef9cb0db3e8e4.tar.xz gsoc2013-epiphany-d0ccaa5cfa129113f6359b1be98ef9cb0db3e8e4.tar.zst gsoc2013-epiphany-d0ccaa5cfa129113f6359b1be98ef9cb0db3e8e4.zip |
embed: remove ephy_embed_go_to_history_item.
Use WebKit API directly.
svn path=/trunk/; revision=8313
-rw-r--r-- | embed/ephy-embed.c | 15 | ||||
-rw-r--r-- | embed/ephy-embed.h | 5 | ||||
-rw-r--r-- | embed/webkit/webkit-embed.c | 10 | ||||
-rw-r--r-- | src/ephy-navigation-action.c | 6 |
4 files changed, 3 insertions, 33 deletions
diff --git a/embed/ephy-embed.c b/embed/ephy-embed.c index b8f137f30..5fff25366 100644 --- a/embed/ephy-embed.c +++ b/embed/ephy-embed.c @@ -993,18 +993,3 @@ ephy_embed_get_visibility (EphyEmbed *embed) EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed); return iface->get_visibility (embed); } - -/** - * ephy_embed_go_to_history_item: - * @embed: an #EphyEmbed - * @history_item: an #EphyHistoryItem - * - * Opens the webpage specified by @history_item in @embed's history. - * - **/ -void -ephy_embed_go_to_history_item (EphyEmbed *embed, EphyHistoryItem *history_item) -{ - EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed); - iface->go_to_history_item (embed, history_item); -} diff --git a/embed/ephy-embed.h b/embed/ephy-embed.h index dfdd9cf77..1c8b14fc9 100644 --- a/embed/ephy-embed.h +++ b/embed/ephy-embed.h @@ -224,8 +224,6 @@ struct _EphyEmbedIface gboolean (* get_is_blank) (EphyEmbed *embed); const char * (* get_loading_title) (EphyEmbed *embed); gboolean (* get_visibility) (EphyEmbed *embed); - void (* go_to_history_item) (EphyEmbed *embed, - EphyHistoryItem *history_item); }; GType ephy_embed_net_state_get_type (void); @@ -349,9 +347,6 @@ void ephy_embed_close (EphyEmbed *embed); gboolean ephy_embed_has_modified_forms (EphyEmbed *embed); -/* History */ -void ephy_embed_go_to_history_item (EphyEmbed *embed, EphyHistoryItem *history_item); - G_END_DECLS #endif diff --git a/embed/webkit/webkit-embed.c b/embed/webkit/webkit-embed.c index caeb3e912..f2e35b6fa 100644 --- a/embed/webkit/webkit-embed.c +++ b/embed/webkit/webkit-embed.c @@ -452,15 +452,6 @@ impl_has_modified_forms (EphyEmbed *embed) } static void -impl_go_to_history_item (EphyEmbed *embed, EphyHistoryItem *history_item) -{ - WebKitEmbed *wembed = WEBKIT_EMBED (embed); - WebKitWebHistoryItem *item = WEBKIT_HISTORY_ITEM (history_item)->data; - - webkit_web_view_go_to_back_forward_item (wembed->priv->web_view, item); -} - -static void ephy_embed_iface_init (EphyEmbedIface *iface) { iface->load_url = impl_load_url; @@ -486,5 +477,4 @@ ephy_embed_iface_init (EphyEmbedIface *iface) iface->print_preview_navigate = impl_print_preview_navigate; iface->has_modified_forms = impl_has_modified_forms; iface->get_security_level = impl_get_security_level; - iface->go_to_history_item = impl_go_to_history_item; } diff --git a/src/ephy-navigation-action.c b/src/ephy-navigation-action.c index d2b257675..b1f72aa6d 100644 --- a/src/ephy-navigation-action.c +++ b/src/ephy-navigation-action.c @@ -118,7 +118,7 @@ static void activate_back_or_forward_menu_item_cb (GtkWidget *menuitem, EphyNavigationAction *action) { - EphyHistoryItem *item; + WebKitWebHistoryItem *item; EphyEmbed *embed; embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (action->priv->window)); @@ -131,10 +131,10 @@ activate_back_or_forward_menu_item_cb (GtkWidget *menuitem, g_return_if_fail (embed != NULL); } - item = (EphyHistoryItem*)g_object_get_data (G_OBJECT (menuitem), HISTORY_ITEM_DATA_KEY); + item = (WebKitWebHistoryItem*)g_object_get_data (G_OBJECT (menuitem), HISTORY_ITEM_DATA_KEY); g_return_if_fail (item != NULL); - ephy_embed_go_to_history_item (embed, item); + webkit_web_view_go_to_back_forward_item (EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed), item); } static void |