Midori Web Browser

Merge lp:~ivaldi/midori/wk2-event-build-error into lp:midori

  1. wk2-event-build-error
  2. Merge into trunk
Proposed by André Stösel
Status: Merged
Approved by: Paweł Forysiuk
Approved revision: 6351
Merged at revision: 6353
Proposed branch: lp:~ivaldi/midori/wk2-event-build-error
Merge into: lp:midori
Diff against target: 15 lines (+2/-0)
1 file modified
midori/midori-view.c (+2/-0)
To merge this branch: bzr merge lp:~ivaldi/midori/wk2-event-build-error
Reviewer Review Type Date Requested Status
Paweł Forysiuk Approve
Review via email: mp+180323@code.launchpad.net

Commit message

Fix webkit2 build error

To post a comment you must log in.
Revision history for this message
Paweł Forysiuk (tuxator) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'midori/midori-view.c'
2--- midori/midori-view.c 2013-08-12 17:40:29 +0000
3+++ midori/midori-view.c 2013-08-15 12:07:05 +0000
4@@ -2577,9 +2577,11 @@
5 #endif
6 MidoriView* view)
7 {
8+ #ifndef HAVE_WEBKIT2
9 GdkEvent* event = gtk_get_current_event();
10 midori_view_ensure_link_uri (view, NULL, NULL, (GdkEventButton *)event);
11 gdk_event_free (event);
12+ #endif
13 MidoriContextAction* menu = midori_view_get_page_context_action (view, hit_test_result);
14 #ifdef HAVE_WEBKIT2
15 webkit_context_menu_remove_all (context_menu);

Subscribers

People subscribed via source and target branches

to all changes: