aboutsummaryrefslogtreecommitdiffstats
path: root/embed
diff options
context:
space:
mode:
authorXan Lopez <xan@src.gnome.org>2008-06-30 15:23:47 +0800
committerXan Lopez <xan@src.gnome.org>2008-06-30 15:23:47 +0800
commitfaf45b0b6340ea93e9d4e8cfef7862885fc816c5 (patch)
treeb2ed05f6b20d3d989858d910467e64e422d5ff39 /embed
parent4a90a2c33e4dd205aed50cd89a18bca5a8721995 (diff)
downloadgsoc2013-epiphany-faf45b0b6340ea93e9d4e8cfef7862885fc816c5.tar
gsoc2013-epiphany-faf45b0b6340ea93e9d4e8cfef7862885fc816c5.tar.gz
gsoc2013-epiphany-faf45b0b6340ea93e9d4e8cfef7862885fc816c5.tar.bz2
gsoc2013-epiphany-faf45b0b6340ea93e9d4e8cfef7862885fc816c5.tar.lz
gsoc2013-epiphany-faf45b0b6340ea93e9d4e8cfef7862885fc816c5.tar.xz
gsoc2013-epiphany-faf45b0b6340ea93e9d4e8cfef7862885fc816c5.tar.zst
gsoc2013-epiphany-faf45b0b6340ea93e9d4e8cfef7862885fc816c5.zip
embed: remove ephy_embed_get_{backward,forward}_history.
Use WebKit APIs directly. svn path=/trunk/; revision=8311
Diffstat (limited to 'embed')
-rw-r--r--embed/ephy-embed.c32
-rw-r--r--embed/ephy-embed.h4
-rw-r--r--embed/webkit/webkit-embed.c47
3 files changed, 0 insertions, 83 deletions
diff --git a/embed/ephy-embed.c b/embed/ephy-embed.c
index 29d7a0859..fd7e223f6 100644
--- a/embed/ephy-embed.c
+++ b/embed/ephy-embed.c
@@ -995,38 +995,6 @@ ephy_embed_get_visibility (EphyEmbed *embed)
}
/**
- * ephy_embed_get_backward_history:
- * @embed: an #EphyEmbed
- *
- * Returns a #GList of #EphyHistoryItem compromising the
- * history items preceding the current location.
- *
- * Return value: a #GList with the preceding history items
- **/
-GList*
-ephy_embed_get_backward_history (EphyEmbed *embed)
-{
- EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed);
- return iface->get_backward_history (embed);
-}
-
-/**
- * ephy_embed_get_forward_history:
- * @embed: an #EphyEmbed
- *
- * Returns a #GList of #EphyHistoryItem compromising the
- * history items succeeding the current location.
- *
- * Return value: a #GList with the succeeding history items
- **/
-GList*
-ephy_embed_get_forward_history (EphyEmbed *embed)
-{
- EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed);
- return iface->get_forward_history (embed);
-}
-
-/**
* ephy_embed_get_previous_history_item:
* @embed: an #EphyEmbed
*
diff --git a/embed/ephy-embed.h b/embed/ephy-embed.h
index ec8b4db65..b3da8da14 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);
- GList * (* get_backward_history) (EphyEmbed *embed);
- GList * (* get_forward_history) (EphyEmbed *embed);
EphyHistoryItem * (* get_next_history_item) (EphyEmbed *embed);
EphyHistoryItem * (* get_previous_history_item) (EphyEmbed *embed);
void (* go_to_history_item) (EphyEmbed *embed,
@@ -354,8 +352,6 @@ void ephy_embed_close (EphyEmbed *embed);
gboolean ephy_embed_has_modified_forms (EphyEmbed *embed);
/* History */
-GList *ephy_embed_get_backward_history (EphyEmbed *embed);
-GList *ephy_embed_get_forward_history (EphyEmbed *embed);
EphyHistoryItem *ephy_embed_get_next_history_item (EphyEmbed *embed);
EphyHistoryItem *ephy_embed_get_previous_history_item (EphyEmbed *embed);
void ephy_embed_go_to_history_item (EphyEmbed *embed, EphyHistoryItem *history_item);
diff --git a/embed/webkit/webkit-embed.c b/embed/webkit/webkit-embed.c
index 7e48c56c2..ef6b677d8 100644
--- a/embed/webkit/webkit-embed.c
+++ b/embed/webkit/webkit-embed.c
@@ -45,8 +45,6 @@ static void ephy_embed_iface_init (EphyEmbedIface *iface);
#define WEBKIT_EMBED_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), WEBKIT_TYPE_EMBED, WebKitEmbedPrivate))
-#define WEBKIT_BACK_FORWARD_LIMIT 100
-
typedef enum
{
WEBKIT_EMBED_LOAD_STARTED,
@@ -71,34 +69,6 @@ struct WebKitEmbedPrivate
EphyHistory *history;
};
-static GList*
-webkit_construct_history_list (WebKitEmbed *embed, WebKitHistoryType hist_type)
-{
- WebKitWebBackForwardList *web_back_forward_list;
- GList *webkit_items, *iter, *ephy_items = NULL;
-
- g_return_val_if_fail (WEBKIT_IS_EMBED (embed), NULL);
-
- web_back_forward_list = webkit_web_view_get_back_forward_list (embed->priv->web_view);
-
- if (hist_type == WEBKIT_HISTORY_FORWARD)
- webkit_items = webkit_web_back_forward_list_get_forward_list_with_limit (web_back_forward_list,
- WEBKIT_BACK_FORWARD_LIMIT);
- else
- webkit_items = webkit_web_back_forward_list_get_back_list_with_limit (web_back_forward_list,
- WEBKIT_BACK_FORWARD_LIMIT);
-
- for (iter = webkit_items; iter != NULL; iter = iter->next) {
- EphyHistoryItem *item = webkit_history_item_new (WEBKIT_WEB_HISTORY_ITEM (iter->data));
- if (item)
- ephy_items = g_list_prepend (ephy_items, item);
- }
-
- g_list_free (webkit_items);
-
- return ephy_items;
-}
-
static EphyHistoryItem*
webkit_construct_history_item (WebKitEmbed *embed, WebKitHistoryType hist_type)
{
@@ -506,21 +476,6 @@ impl_has_modified_forms (EphyEmbed *embed)
return FALSE;
}
-static GList*
-impl_get_backward_history (EphyEmbed *embed)
-{
- return webkit_construct_history_list (WEBKIT_EMBED (embed),
- WEBKIT_HISTORY_BACKWARD);
-}
-
-static GList*
-impl_get_forward_history (EphyEmbed *embed)
-{
- return webkit_construct_history_list (WEBKIT_EMBED (embed),
- WEBKIT_HISTORY_FORWARD);
-
-}
-
static EphyHistoryItem*
impl_get_next_history_item (EphyEmbed *embed)
{
@@ -569,8 +524,6 @@ 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->get_backward_history = impl_get_backward_history;
- iface->get_forward_history = impl_get_forward_history;
iface->get_next_history_item = impl_get_next_history_item;
iface->get_previous_history_item = impl_get_previous_history_item;
iface->go_to_history_item = impl_go_to_history_item;