Merge lp:~bregma/libgrip/raring-lp-1188693 into lp:libgrip/raring

Proposed by Stephen M. Webb on 2013-06-27
Status: Merged
Approved by: Marco Trevisan (Treviño) on 2013-06-27
Approved revision: 78
Merged at revision: 78
Proposed branch: lp:~bregma/libgrip/raring-lp-1188693
Merge into: lp:libgrip/raring
Diff against target: 12 lines (+1/-1)
1 file modified
src/gripgesturemanager.c (+1/-1)
To merge this branch: bzr merge lp:~bregma/libgrip/raring-lp-1188693
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve on 2013-06-27
Marco Trevisan (Treviño) 2013-06-27 Approve on 2013-06-27
Review via email: mp+171819@code.launchpad.net

Commit message

Uses the correct ID for the top-level window (lp: #1188693).

Description of the change

Uses the correct ID for the top-level window. Fixes #1188693, cherry-picked from trunk. Bug blocks SRUd release of #1168370 in Ubuntu 13.04.

To post a comment you must log in.
Marco Trevisan (Treviño) (3v1n0) wrote :

Seems fine

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/gripgesturemanager.c'
2--- src/gripgesturemanager.c 2013-05-14 18:47:27 +0000
3+++ src/gripgesturemanager.c 2013-06-27 14:42:43 +0000
4@@ -722,7 +722,7 @@
5
6 GripGestureManagerPrivate *priv = req->manager->priv;
7
8- guint window_id = GDK_WINDOW_XID (gtk_widget_get_window(req->widget));
9+ guint window_id = GDK_WINDOW_XID (gtk_widget_get_window(toplevel));
10
11 /* XXX - check for duplicates in reg->bindings first */
12 GripGestureBinding *binding = g_new0 (GripGestureBinding, 1);

Subscribers

People subscribed via source and target branches

to all changes: