Merge lp:~ivaldi/midori/fix-1185895 into lp:midori

[André Stösel]

Fix segfault when right clicking on a web view.

[Cris Dywan (kalikiana)]

I haven't reproduced the crash, but it does still work as far as I can say after a test round. It probably should be almost identical, so there must be some sort of extra value that our code doesn't care about that WebKit uses.

review: Approve

[gue5t gue5t (gue5t)]

This looks good except that it will leak the event: <https://developer.gnome.org/gtk3/stable/gtk3-General.html#gtk-get-current-event>

review: Needs Fixing

[André Stösel (ivaldi)]

You're right, thank you. I pushed a new patch and opened a new merge request.
https://code.launchpad.net/~ivaldi/midori/fix-1185895/+merge/166727

=== modified file 'midori/midori-view.c'
--- midori/midori-view.c	2013-05-29 09:20:28 +0000
+++ midori/midori-view.c	2013-05-30 17:04:23 +0000
@@ -1813,14 +1813,9 @@
 
     if (gtk_widget_get_window (view->web_view))
     {
-        GdkEventButton ev;
 
         if (!event) {
-            gint ex, ey;
-            event = &ev;
-            gdk_window_get_pointer (gtk_widget_get_window (view->web_view), &ex, &ey, NULL);
-            event->x = ex;
-            event->y = ey;
+            event = (GdkEventButton *)gtk_get_current_event();
         }
 
         if (x != NULL)