r31785 - in /desktop/unstable/gtk+3.0/debian: changelog patches/017_no_offscreen_device_grabbing.patch patches/series

[mpitt at users.alioth.debian.org]

Author: mpitt
Date: Tue Nov 22 09:00:30 2011
New Revision: 31785

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31785
Log:
Add 017_no_offscreen_device_grabbing.patch: Do not allow devices in an
offscreen hierarchy to take grabs. (LP: #804009, GNOME #658563)

Added:
    desktop/unstable/gtk+3.0/debian/patches/017_no_offscreen_device_grabbing.patch
Modified:
    desktop/unstable/gtk+3.0/debian/changelog
    desktop/unstable/gtk+3.0/debian/patches/series

Modified: desktop/unstable/gtk+3.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/changelog?rev=31785&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/changelog [utf-8] Tue Nov 22 09:00:30 2011
@@ -7,6 +7,8 @@
     GtkOffscreenWindow seem like they should not be allowed to do
     grab the mouse or whatever, as this can deactivate open menus.
     (LP: #512427, GNOME #607668)
+  * Add 017_no_offscreen_device_grabbing.patch: Do not allow devices in an
+    offscreen hierarchy to take grabs. (LP: #804009, GNOME #658563)
 
  -- Martin Pitt <mpitt at debian.org>  Tue, 22 Nov 2011 09:34:45 +0100
 

Added: desktop/unstable/gtk+3.0/debian/patches/017_no_offscreen_device_grabbing.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/patches/017_no_offscreen_device_grabbing.patch?rev=31785&op=file
==============================================================================
--- desktop/unstable/gtk+3.0/debian/patches/017_no_offscreen_device_grabbing.patch (added)
+++ desktop/unstable/gtk+3.0/debian/patches/017_no_offscreen_device_grabbing.patch [utf-8] Tue Nov 22 09:00:30 2011
@@ -1,0 +1,24 @@
+Description: Do not allow devices in an offscreen hierarchy to take grabs.
+Author: Robert Carr <racarr at canonical.com>
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=658563
+Bug-Ubuntu: https://launchpad.net/bugs/804009
+
+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: desktop/unstable/gtk+3.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/patches/series?rev=31785&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/patches/series [utf-8] Tue Nov 22 09:00:30 2011
@@ -3,6 +3,7 @@
 003_gdk.pc_privates.patch
 015_default-fallback-icon-theme.patch
 016_no_offscreen_widgets_grabbing.patch
+017_no_offscreen_device_grabbing.patch
 022_disable-viqr-im-for-vi-locale.patch
 041_ia32-libs.patch
 042_treeview_single-focus.patch