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

[Robert Carr]

A less fail version of this merge:
https://code.launchpad.net/~robertcarr/gtk/fix-offscreen-grabs/+merge/73870

[Sebastien Bacher (seb128)]

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

[Robert Carr (robertcarr)]

https://bugzilla.gnome.org/show_bug.cgi?id=658563

[lp:~robertcarr/gtk/fix-offscreen-grabs]

83. By Robert Carr on 2011-09-12

Update patch metadata

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-08 10:45:21 +0000
+++ debian/changelog	2011-09-12 15:29:02 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 gtk+3.0 (3.1.18-0ubuntu2) oneiric; urgency=low
 
   * Add 101_gdkenumtypes.c_location.patch: Always generate gdk/gdkenumtypes.c
@@ -40,6 +41,16 @@
 
  -- Martin Pitt <[e-mail]>  Mon, 05 Sep 2011 13:01:21 +0200
 
+=======
+gtk+3.0 (3.1.12-0ubuntu3) oneiric; urgency=low
+
+    * debian/patches/111_no_offscreen_device_grabs.patch: Do not allow 
+      widgets in an offscreen hiearchy to make grabs. Required to fix 
+      LP: #804009
+
+ -- Robert Carr <racarr@Candide>  Fri, 02 Sep 2011 14:39:46 -0400
+
+>>>>>>> MERGE-SOURCE
 gtk+3.0 (3.1.12-0ubuntu2) oneiric; urgency=low
 
   * debian/patches/101_css_provider_load_from_data_crash.patch:

=== added file 'debian/patches/111_no_offscreen_device_grabs.patch'
--- debian/patches/111_no_offscreen_device_grabs.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/111_no_offscreen_device_grabs.patch	2011-09-12 15:29:02 +0000
@@ -0,0 +1,23 @@
+## Description: Do not allow widgets in an offscreen hierarchy to take grabs.
+## Origin/Author: Robert Carr <[e-mail]>
+## Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/indicator-sound/+bug/804009
+## Bug: https://bugzilla.gnome.org/show_bug.cgi?id=658563
+Index: gtk+3.0-3.1.12/gtk/gtkmain.c
+===================================================================
+--- gtk+3.0-3.1.12.orig/gtk/gtkmain.c	2011-09-02 14:39:44.225887145 -0400
++++ gtk+3.0-3.1.12/gtk/gtkmain.c	2011-09-02 14:39:36.415886932 -0400
+@@ -2303,9 +2303,14 @@
+ {
+   GtkWindowGroup *group;
+   GtkWidget *old_grab_widget;
++  GdkWindow *toplevel;
+ 
+   g_return_if_fail (GTK_IS_WIDGET (widget));
+   g_return_if_fail (GDK_IS_DEVICE (device));
++  
++  toplevel = gdk_window_get_toplevel (gtk_widget_get_window (widget));
++  if (toplevel && gdk_window_get_window_type (toplevel) == GDK_WINDOW_OFFSCREEN)
++    return;
+ 
+   group = gtk_main_get_window_group (widget);
+   old_grab_widget = gtk_window_group_get_current_device_grab (group, device);

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-09-08 08:25:17 +0000
+++ debian/patches/series	2011-09-12 15:29:02 +0000
@@ -17,4 +17,11 @@
 092_default_to_xdg_document_dir.patch
 093_no_deprecated.patch
 100_overlay_scrollbar_loading.patch
+<<<<<<< TREE
 101_gdkenumtypes.c_location.patch
+=======
+
+
+101_css_provider_load_from_data_crash.patch
+111_no_offscreen_device_grabs.patch
+>>>>>>> MERGE-SOURCE