Merge lp:~robertcarr/gtk/fix-offscreen-grabs into lp:~ubuntu-desktop/gtk/ubuntugtk3

Proposed by Robert Carr on 2011-09-02
Status: Merged
Merged at revision: 95
Proposed branch: lp:~robertcarr/gtk/fix-offscreen-grabs
Merge into: lp:~ubuntu-desktop/gtk/ubuntugtk3
Diff against target: 69 lines (+41/-0) (has conflicts)
3 files modified
debian/changelog (+11/-0)
debian/patches/111_no_offscreen_device_grabs.patch (+23/-0)
debian/patches/series (+7/-0)
Text conflict in debian/changelog
Text conflict in debian/patches/series
To merge this branch: bzr merge lp:~robertcarr/gtk/fix-offscreen-grabs
Reviewer Review Type Date Requested Status
Ubuntu Desktop 2011-09-02 Pending
Review via email: mp+73876@code.launchpad.net

Description of the change

To post a comment you must log in.
Sebastien Bacher (seb128) wrote :

Thanks for your work, could you also submit the patch to GNOME and add the bugzilla url there? We try to make sure patches are at least sent upstream before being applied to the distribution

83. By Robert Carr on 2011-09-12

Update patch metadata

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-09-08 10:45:21 +0000
3+++ debian/changelog 2011-09-12 15:29:02 +0000
4@@ -1,3 +1,4 @@
5+<<<<<<< TREE
6 gtk+3.0 (3.1.18-0ubuntu2) oneiric; urgency=low
7
8 * Add 101_gdkenumtypes.c_location.patch: Always generate gdk/gdkenumtypes.c
9@@ -40,6 +41,16 @@
10
11 -- Martin Pitt <martin.pitt@ubuntu.com> Mon, 05 Sep 2011 13:01:21 +0200
12
13+=======
14+gtk+3.0 (3.1.12-0ubuntu3) oneiric; urgency=low
15+
16+ * debian/patches/111_no_offscreen_device_grabs.patch: Do not allow
17+ widgets in an offscreen hiearchy to make grabs. Required to fix
18+ LP: #804009
19+
20+ -- Robert Carr <racarr@Candide> Fri, 02 Sep 2011 14:39:46 -0400
21+
22+>>>>>>> MERGE-SOURCE
23 gtk+3.0 (3.1.12-0ubuntu2) oneiric; urgency=low
24
25 * debian/patches/101_css_provider_load_from_data_crash.patch:
26
27=== added file 'debian/patches/111_no_offscreen_device_grabs.patch'
28--- debian/patches/111_no_offscreen_device_grabs.patch 1970-01-01 00:00:00 +0000
29+++ debian/patches/111_no_offscreen_device_grabs.patch 2011-09-12 15:29:02 +0000
30@@ -0,0 +1,23 @@
31+## Description: Do not allow widgets in an offscreen hierarchy to take grabs.
32+## Origin/Author: Robert Carr <racarr@canonical.com>
33+## Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/indicator-sound/+bug/804009
34+## Bug: https://bugzilla.gnome.org/show_bug.cgi?id=658563
35+Index: gtk+3.0-3.1.12/gtk/gtkmain.c
36+===================================================================
37+--- gtk+3.0-3.1.12.orig/gtk/gtkmain.c 2011-09-02 14:39:44.225887145 -0400
38++++ gtk+3.0-3.1.12/gtk/gtkmain.c 2011-09-02 14:39:36.415886932 -0400
39+@@ -2303,9 +2303,14 @@
40+ {
41+ GtkWindowGroup *group;
42+ GtkWidget *old_grab_widget;
43++ GdkWindow *toplevel;
44+
45+ g_return_if_fail (GTK_IS_WIDGET (widget));
46+ g_return_if_fail (GDK_IS_DEVICE (device));
47++
48++ toplevel = gdk_window_get_toplevel (gtk_widget_get_window (widget));
49++ if (toplevel && gdk_window_get_window_type (toplevel) == GDK_WINDOW_OFFSCREEN)
50++ return;
51+
52+ group = gtk_main_get_window_group (widget);
53+ old_grab_widget = gtk_window_group_get_current_device_grab (group, device);
54
55=== modified file 'debian/patches/series'
56--- debian/patches/series 2011-09-08 08:25:17 +0000
57+++ debian/patches/series 2011-09-12 15:29:02 +0000
58@@ -17,4 +17,11 @@
59 092_default_to_xdg_document_dir.patch
60 093_no_deprecated.patch
61 100_overlay_scrollbar_loading.patch
62+<<<<<<< TREE
63 101_gdkenumtypes.c_location.patch
64+=======
65+
66+
67+101_css_provider_load_from_data_crash.patch
68+111_no_offscreen_device_grabs.patch
69+>>>>>>> MERGE-SOURCE

Subscribers

People subscribed via source and target branches

to all changes: