debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Bump new context menu handling to WebKitGTK+ 1.1.16

Browse source 
The API in 1.1.15 is not sufficient to implement the context menu
without regressions.
This commit is contained in:
Christian Dywan 2009-09-21 23:49:42 +02:00
parent bb0688b796
commit d26113fa1e
1 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
midori/midori-view.c
View file

@ -69,7 +69,7 @@ struct _MidoriView
MidoriLoadStatus load_status; MidoriLoadStatus load_status;
gboolean minimized; gboolean minimized;
gchar* statusbar_text; gchar* statusbar_text;
#if WEBKIT_CHECK_VERSION (1, 1, 15) #if WEBKIT_CHECK_VERSION (1, 1, 16)
WebKitHitTestResult* hit_test; WebKitHitTestResult* hit_test;
#endif #endif
gchar* link_uri; gchar* link_uri;
@ -1053,7 +1053,7 @@ gtk_widget_button_press_event_cb (WebKitWebView* web_view,
else if (view->middle_click_opens_selection) else if (view->middle_click_opens_selection)
{ {
gboolean is_editable; gboolean is_editable;
#if WEBKIT_CHECK_VERSION (1, 1, 15) #if WEBKIT_CHECK_VERSION (1, 1, 16)
WebKitHitTestResult* result; WebKitHitTestResult* result;
WebKitHitTestResultContext context; WebKitHitTestResultContext context;
@ -1170,7 +1170,7 @@ gtk_widget_scroll_event_cb (WebKitWebView* web_view,
return FALSE; return FALSE;
} }
#if WEBKIT_CHECK_VERSION (1, 1, 15) #if WEBKIT_CHECK_VERSION (1, 1, 16)
static void static void
midori_web_view_menu_open_activate_cb (GtkWidget* widget, midori_web_view_menu_open_activate_cb (GtkWidget* widget,
MidoriView* view) MidoriView* view)
@ -1412,7 +1412,7 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view,
gboolean is_document; gboolean is_document;
GtkWidget* label; GtkWidget* label;
#if WEBKIT_CHECK_VERSION (1, 1, 15) #if WEBKIT_CHECK_VERSION (1, 1, 16)
gint x, y; gint x, y;
GdkEventButton event; GdkEventButton event;
WebKitHitTestResultContext context; WebKitHitTestResultContext context;
@ -1482,7 +1482,7 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view,
return; return;
} }
#if WEBKIT_CHECK_VERSION (1, 1, 15) #if WEBKIT_CHECK_VERSION (1, 1, 16)
items = gtk_container_get_children (GTK_CONTAINER (menu)); items = gtk_container_get_children (GTK_CONTAINER (menu));
i = 0; i = 0;
while ((menuitem = g_list_nth_data (items, i++))) while ((menuitem = g_list_nth_data (items, i++)))
@ -1627,7 +1627,7 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view,
} }
g_object_unref (search_engines); g_object_unref (search_engines);
} }
#if WEBKIT_CHECK_VERSION (1, 1, 15) #if WEBKIT_CHECK_VERSION (1, 1, 16)
midori_view_insert_menu_item (menu_shell, 0, midori_view_insert_menu_item (menu_shell, 0,
_("_Search the Web"), GTK_STOCK_FIND, _("_Search the Web"), GTK_STOCK_FIND,
G_CALLBACK (midori_web_view_menu_search_web_activate_cb), widget); G_CALLBACK (midori_web_view_menu_search_web_activate_cb), widget);
@ -1656,7 +1656,7 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view,
if (is_document) if (is_document)
{ {
#if WEBKIT_CHECK_VERSION (1, 1, 15) #if WEBKIT_CHECK_VERSION (1, 1, 16)
menuitem = sokoke_action_create_popup_menu_item ( menuitem = sokoke_action_create_popup_menu_item (
gtk_action_group_get_action (actions, "Back")); gtk_action_group_get_action (actions, "Back"));
gtk_menu_shell_append (menu_shell, menuitem); gtk_menu_shell_append (menu_shell, menuitem);
@ -1690,6 +1690,23 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view,
gtk_menu_shell_append (menu_shell, menuitem); gtk_menu_shell_append (menu_shell, menuitem);
gtk_menu_shell_append (menu_shell, gtk_separator_menu_item_new ()); gtk_menu_shell_append (menu_shell, gtk_separator_menu_item_new ());
#if WEBKIT_CHECK_VERSION (1, 1, 16)
/* if (webkit_web_view_get_main_frame (web_view) != frame_under_mouse)
{
midori_view_insert_menu_item (menu_shell, -1,
_("Open _Frame in New Tab"), NULL,
G_CALLBACK (midori_web_view_menu_frame_new_tab_activate_cb), widget);
midori_view_insert_menu_item (menu_shell, -1,
_("Open _Frame in New Window"), NULL,
G_CALLBACK (midori_web_view_menu_frame_new_window_activate_cb), widget);
} */
/* FIXME: There is currently no API to inspect an URI
midori_view_insert_menu_item (menu_shell, -1,
_("Inspect page"), NULL,
G_CALLBACK (midori_web_view_menu_inspect_page_activate_cb), widget); */
#endif
menuitem = sokoke_action_create_popup_menu_item ( menuitem = sokoke_action_create_popup_menu_item (
gtk_action_group_get_action (actions, "ZoomIn")); gtk_action_group_get_action (actions, "ZoomIn"));
gtk_menu_shell_append (menu_shell, menuitem); gtk_menu_shell_append (menu_shell, menuitem);
@ -2022,7 +2039,7 @@ midori_view_init (MidoriView* view)
view->load_status = MIDORI_LOAD_FINISHED; view->load_status = MIDORI_LOAD_FINISHED;
view->minimized = FALSE; view->minimized = FALSE;
view->statusbar_text = NULL; view->statusbar_text = NULL;
#if WEBKIT_CHECK_VERSION (1, 1, 15) #if WEBKIT_CHECK_VERSION (1, 1, 16)
view->hit_test = NULL; view->hit_test = NULL;
#endif #endif
view->link_uri = NULL; view->link_uri = NULL;