aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Escalante Urrelo <diegoe@gnome.org>2007-07-30 15:40:49 +0800
committerDiego Escalante Urrelo <diegoe@src.gnome.org>2007-07-30 15:40:49 +0800
commitf6d020a4a48d457a6397ad229ec7ef15f43d6fe7 (patch)
tree49c81bf39d153edd0e2ee9af038b48ae372ff1dc
parent924ebebc760524a00409bf88cfd241b3e5281a4a (diff)
downloadgsoc2013-epiphany-f6d020a4a48d457a6397ad229ec7ef15f43d6fe7.tar
gsoc2013-epiphany-f6d020a4a48d457a6397ad229ec7ef15f43d6fe7.tar.gz
gsoc2013-epiphany-f6d020a4a48d457a6397ad229ec7ef15f43d6fe7.tar.bz2
gsoc2013-epiphany-f6d020a4a48d457a6397ad229ec7ef15f43d6fe7.tar.lz
gsoc2013-epiphany-f6d020a4a48d457a6397ad229ec7ef15f43d6fe7.tar.xz
gsoc2013-epiphany-f6d020a4a48d457a6397ad229ec7ef15f43d6fe7.tar.zst
gsoc2013-epiphany-f6d020a4a48d457a6397ad229ec7ef15f43d6fe7.zip
can_go methods now work, WebKit was missing the implementations for those
2007-07-30 Diego Escalante Urrelo <diegoe@gnome.org> * embed/webkit/webkit-embed.cpp: can_go methods now work, WebKit was missing the implementations for those functions, it's fixed now so we can use can_go methods. Note that they are useless without the ge_location signal being emitted (dummy code included, commented). Part of Bug #461652. svn path=/trunk/; revision=7216
-rw-r--r--ChangeLog11
-rw-r--r--embed/webkit/webkit-embed.cpp29
2 files changed, 36 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 1e6f3759a..dff4bdee0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2007-07-30 Diego Escalante Urrelo <diegoe@gnome.org>
+
+ * embed/webkit/webkit-embed.cpp:
+
+ can_go methods now work, WebKit was missing the implementations for
+ those functions, it's fixed now so we can use can_go methods.
+ Note that they are useless without the ge_location signal being
+ emitted (dummy code included, commented).
+
+ Part of Bug #461652.
+
2007-07-30 Xan Lopez <xan@gnome.org>
* embed/webkit/webkit-embed-persist.cpp:
diff --git a/embed/webkit/webkit-embed.cpp b/embed/webkit/webkit-embed.cpp
index 4302ab51d..fb5839ba8 100644
--- a/embed/webkit/webkit-embed.cpp
+++ b/embed/webkit/webkit-embed.cpp
@@ -41,6 +41,10 @@ static void webkit_embed_finalize (GObject *object);
static void ephy_embed_iface_init (EphyEmbedIface *iface);
#if 0
+static void load_started_cb (WebKitGtkPage *page,
+ WebKitGtkFrame *frame,
+ WebKitEmbed *wembed);
+
static void webkit_embed_location_changed_cb (GtkMozEmbed *embed,
WebKitEmbed *membed);
static void webkit_embed_net_state_all_cb (GtkMozEmbed *embed,
@@ -153,6 +157,8 @@ webkit_embed_init (WebKitEmbed *embed)
gtk_widget_show (GTK_WIDGET (page));
#if 0
+ g_signal_connect (G_OBJECT (page), "load-started",
+ G_CALLBACK (load_started_cb), embed);
g_signal_connect (G_OBJECT (page), "title-changed",
G_CALLBACK (title_changed_cb), page);
g_signal_connect (G_OBJECT (page), "load-progress-changed",
@@ -172,6 +178,17 @@ webkit_embed_finalize (GObject *object)
G_OBJECT_CLASS (webkit_embed_parent_class)->finalize (object);
}
+#if 0
+static void
+load_started_cb (WebKitGtkPage *page,
+ WebKitGtkFrame *frame,
+ WebKitEmbed *wembed)
+{
+ g_debug("load-started, emitting ge_location with www.google.com as location");
+ g_signal_emit_by_name (wembed, "ge_location", "www.google.com");
+}
+#endif
+
static void
impl_load_url (EphyEmbed *embed,
const char *url)
@@ -206,14 +223,18 @@ impl_stop_load (EphyEmbed *embed)
static gboolean
impl_can_go_back (EphyEmbed *embed)
{
- // return webkit_gtk_page_can_go_backward (WEBKIT_EMBED (embed)->priv->page);
- return FALSE;
+ return webkit_gtk_page_can_go_backward (WEBKIT_EMBED (embed)->priv->page);
}
static gboolean
impl_can_go_forward (EphyEmbed *embed)
{
- // return webkit_gtk_page_can_go_forward (WEBKIT_EMBED (embed)->priv->page);
+ return webkit_gtk_page_can_go_forward (WEBKIT_EMBED (embed)->priv->page);
+}
+
+static gboolean
+impl_can_go_up (EphyEmbed *embed)
+{
return FALSE;
}
@@ -408,7 +429,7 @@ ephy_embed_iface_init (EphyEmbedIface *iface)
iface->stop_load = impl_stop_load;
iface->can_go_back = impl_can_go_back;
iface->can_go_forward = impl_can_go_forward;
- // iface->can_go_up = impl_can_go_up;
+ iface->can_go_up = impl_can_go_up;
iface->get_go_up_list = impl_get_go_up_list;
iface->go_back = impl_go_back;
iface->go_forward = impl_go_forward;