svnno****@sourc*****
svnno****@sourc*****
Tue Jan 6 10:50:11 JST 2009
Revision: 3523 http://svn.sourceforge.jp/view?root=kazehakase&view=rev&rev=3523 Author: ikezoe Date: 2009-01-06 10:50:10 +0900 (Tue, 06 Jan 2009) Log Message: ----------- 2009-01-06 Hiroyuki Ikezoe <poinc****@ikezo*****> * module/embed/webkit-gtk/kz-webkit-gtk.c: Implement find. * module/embed/webkit-gtk/kz-webkit-gtk.c (merge_history_items_to_history): Skip if item is NULL. Modified Paths: -------------- kazehakase/trunk/ChangeLog kazehakase/trunk/module/embed/webkit-gtk/kz-webkit-gtk.c Modified: kazehakase/trunk/ChangeLog =================================================================== --- kazehakase/trunk/ChangeLog 2009-01-05 03:35:07 UTC (rev 3522) +++ kazehakase/trunk/ChangeLog 2009-01-06 01:50:10 UTC (rev 3523) @@ -1,3 +1,9 @@ +2009-01-06 Hiroyuki Ikezoe <poinc****@ikezo*****> + + * module/embed/webkit-gtk/kz-webkit-gtk.c: Implement find. + * module/embed/webkit-gtk/kz-webkit-gtk.c + (merge_history_items_to_history): Skip if item is NULL. + 2009-01-05 Hiroyuki Ikezoe <poinc****@ikezo*****> * module/embed/webkit-gtk/kz-webkit-gtk.c: Set link address when Modified: kazehakase/trunk/module/embed/webkit-gtk/kz-webkit-gtk.c =================================================================== --- kazehakase/trunk/module/embed/webkit-gtk/kz-webkit-gtk.c 2009-01-05 03:35:07 UTC (rev 3522) +++ kazehakase/trunk/module/embed/webkit-gtk/kz-webkit-gtk.c 2009-01-06 01:50:10 UTC (rev 3523) @@ -108,6 +108,9 @@ gboolean is_relative, gchar **uri, gchar **title); +static gboolean find (KzEmbed *kzembed, + const char *keyword, + gboolean backward); static void cb_title_changed (WebKitWebView* web_view, WebKitWebFrame* web_frame, const gchar* title, @@ -225,7 +228,7 @@ iface->paste = paste; iface->select_all = select_all; iface->get_selection_string = NULL; - iface->find = NULL; + iface->find = find; iface->incremental_search = NULL; iface->selection_is_collapsed = selection_is_collapsed; iface->get_links = NULL; @@ -691,6 +694,8 @@ for (node = items; node; node = g_list_next(node)) { WebKitWebHistoryItem *item = WEBKIT_WEB_HISTORY_ITEM(node->data); + if (!item) + continue; merge_item_to_history(history, current_bookmark, item); } } @@ -801,6 +806,16 @@ *title = g_strdup(webkit_web_history_item_get_title(item)); } +static gboolean +find (KzEmbed *kzembed, const char *keyword, gboolean backward) +{ + return webkit_web_view_search_text(KZ_WEBKIT_GTK_GET_PRIVATE(kzembed)->web_view, + keyword, + FALSE, + !backward, + TRUE); +} + static void cb_title_changed (WebKitWebView* web_view, WebKitWebFrame* web_frame,