Midori Web Browser

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

  1. fix-1185895
  2. Merge into trunk
Proposed by André Stösel
Status: Merged
Approved by: Paweł Forysiuk
Approved revision: 6183
Merged at revision: 6188
Proposed branch: lp:~ivaldi/midori/fix-1185895
Merge into: lp:midori
Diff against target: 26 lines (+4/-5)
1 file modified
midori/midori-view.c (+4/-5)
To merge this branch: bzr merge lp:~ivaldi/midori/fix-1185895
Reviewer Review Type Date Requested Status
Paweł Forysiuk Approve
gue5t gue5t Approve
Review via email: mp+166727@code.launchpad.net

Commit message

Fix memory leak introduced in r6184

To post a comment you must log in.
Revision history for this message
gue5t gue5t (gue5t) wrote :

Looks good.

review: Approve
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-05-30 16:40:15 +0000
3+++ midori/midori-view.c 2013-05-31 09:42:49 +0000
4@@ -1814,10 +1814,6 @@
5 if (gtk_widget_get_window (view->web_view))
6 {
7
8- if (!event) {
9- event = (GdkEventButton *)gtk_get_current_event();
10- }
11-
12 if (x != NULL)
13 *x = event->x;
14 if (y != NULL)
15@@ -2608,7 +2604,10 @@
16 gboolean is_image;
17 gboolean is_media;
18
19- midori_view_ensure_link_uri (view, &x, &y, NULL);
20+ GdkEvent* event = gtk_get_current_event();
21+ midori_view_ensure_link_uri (view, &x, &y, (GdkEventButton *)event);
22+ gdk_event_free (event);
23+
24 context = katze_object_get_int (view->hit_test, "context");
25 has_selection = context & WEBKIT_HIT_TEST_RESULT_CONTEXT_SELECTION;
26 /* Ensure view->selected_text */

Subscribers

People subscribed via source and target branches

to all changes: