svnno****@sourc*****
svnno****@sourc*****
Wed Apr 25 13:00:49 JST 2007
Revision: 3210
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=3210
Author: ikezoe
Date: 2007-04-25 13:00:49 +0900 (Wed, 25 Apr 2007)
Log Message:
-----------
a lot of fixes.
Modified Paths:
--------------
kazehakase/trunk/module/embed/gtk-webcore/kz-webkit-gtk.cpp
Modified: kazehakase/trunk/module/embed/gtk-webcore/kz-webkit-gtk.cpp
===================================================================
--- kazehakase/trunk/module/embed/gtk-webcore/kz-webkit-gtk.cpp 2007-04-25 03:48:35 UTC (rev 3209)
+++ kazehakase/trunk/module/embed/gtk-webcore/kz-webkit-gtk.cpp 2007-04-25 04:00:49 UTC (rev 3210)
@@ -27,7 +27,7 @@
#include <glib/gi18n.h>
#include <math.h>
#include <webkit-gtk/webkit-ui-delegate.h>
-#include <webi-types.h>
+#include <webi.h>
#include "kazehakase.h"
#include "kz-webkit-gtk.h"
@@ -247,6 +247,7 @@
webkit_gtk_class = (WebkitViewClass *) klass;
object_class->dispose = kz_webkit_gtk_dispose;
+#if 0
webkit_gtk_class->status = kz_webkit_gtk_status;
webkit_gtk_class->load_start = kz_webkit_gtk_load_start;
webkit_gtk_class->load_stop = kz_webkit_gtk_load_stop;
@@ -260,7 +261,7 @@
webkit_gtk_class->req_new_window = kz_webkit_gtk_req_new_window;
webkit_gtk_class->close_window = kz_webkit_gtk_close_window;
webkit_gtk_class->set_cookie = kz_webkit_gtk_set_cookie;
-
+#endif
g_type_class_add_private (object_class, sizeof(KzWebkitGtkPrivate));
}
@@ -378,7 +379,7 @@
}
static void
-kz_webkit_gtk_mouse_iface_init (WebiUIDelegateInterface *iface)
+kz_webkit_gtk_mouse_iface_init (WebkitUIDelegateInterface *iface)
{
iface->mouse_action_on_element = NULL;
}
@@ -654,7 +655,8 @@
set_default_preferences(webkit_gtk);
webi_set_emit_internal_status(WEBI(webkit_gtk), TRUE);
- webkit_set_ui_delegate(WEBI(webkit_gtk), WEBI_UI_DELEGATE(webkit_gtk));
+ WebkitFrame *frame = webkit_view_get_main_frame(WEBKIT_VIEW(webkit_gtk));
+ webkit_set_ui_delegate(frame, WEBKIT_UI_DELEGATE(webkit_gtk));
gtk_widget_show(GTK_WIDGET(webkit_gtk));
}
@@ -875,22 +877,22 @@
*kzevent = ret;
}
-static void
-kz_webkit_gtk_mouse_action_on_element (WebiUIDelegate *self,
- WebkitView *sender,
- WebKitElementInfo *element_info,
- WebKitMouseEventInfo *mouse_info)
+static gboolean
+kz_webkit_gtk_mouse_action_on_element (WebkitUIDelegate *delegate,
+ WebkitView *sender,
+ WebkitElementInfo *element_info,
+ WebkitMouseEventInfo *mouse_info)
{
}
KzEmbedEventMouse *kzevent;
gint ret = FALSE;
KzWebkitGtkPrivate *priv;
- g_return_if_fail(KZ_IS_WEBKIT_GTK(webi));
+ g_return_val_if_fail(KZ_IS_WEBKIT_GTK(delegate), FALSE);
- priv = KZ_WEBKIT_GTK_GET_PRIVATE(webi);
+ priv = KZ_WEBKIT_GTK_GET_PRIVATE(delegate);
get_mouse_event_info(&kzevent);
- const gchar *link_url = webi_event_info_get_link_url((WebiEventInfo*)event_info);
+ const gchar *link_url = webkit_element_info_get_link_url(element_info);
if (!link_url)
{
if (priv->link_message)
@@ -905,7 +907,7 @@
KzEmbedEvent *info = (KzEmbedEvent *) kzevent;
info->context |= KZ_CONTEXT_LINK;
info->link = g_strdup(link_url);
- info->linktext = g_strdup(webi_event_info_get_link_label((WebiEventInfo*)event_info));
+ info->linktext = g_strdup(webkit_element_info_get_link_label(element_info));
if (priv->link_message)
g_free(priv->link_message);