r52871 - in /desktop/unstable/gtk+3.0/debian: changelog patches/fix-gtk-menu-sliders.patch patches/series

[jbicha-guest at users.alioth.debian.org]

Author: jbicha-guest
Date: Thu Aug 24 00:56:19 2017
New Revision: 52871

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=52871
Log:
Add patch to fix regression with clicking on sliders in menus

Added:
    desktop/unstable/gtk+3.0/debian/patches/fix-gtk-menu-sliders.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=52871&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/changelog	[utf-8] Thu Aug 24 00:56:19 2017
@@ -1,9 +1,15 @@
 gtk+3.0 (3.22.18-2) UNRELEASED; urgency=medium
 
+  [ Ken VanDine ]
   * debian/control.in:
     - Bump libpango1.0-dev Build-Depends to >= 1.40.5 for colornames test
 
- -- Ken VanDine <ken.vandine at canonical.com>  Sat, 19 Aug 2017 10:34:57 -0400
+  [ Jeremy Bicha ]
+  * Add fix-gtk-menu-sliders.patch:
+    - Add Bugzilla patch to fix regression with clicking on sliders in menus,
+      such as with Unity's sound indicator (LP: #1712701) (Closes: #872687)
+
+ -- Jeremy Bicha <jbicha at ubuntu.com>  Wed, 23 Aug 2017 20:54:47 -0400
 
 gtk+3.0 (3.22.18-1) unstable; urgency=medium
 

Added: desktop/unstable/gtk+3.0/debian/patches/fix-gtk-menu-sliders.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/patches/fix-gtk-menu-sliders.patch?rev=52871&op=file
==============================================================================
--- desktop/unstable/gtk+3.0/debian/patches/fix-gtk-menu-sliders.patch	(added)
+++ desktop/unstable/gtk+3.0/debian/patches/fix-gtk-menu-sliders.patch	[utf-8] Thu Aug 24 00:56:19 2017
@@ -0,0 +1,29 @@
+From b9c154ed207d0c8dfa0929a4df1cf2a269cbb9a1 Mon Sep 17 00:00:00 2001
+From: Carlos Garnacho <carlosg at gnome.org>
+Date: Thu, 10 Aug 2017 11:56:47 +0200
+Subject: [PATCH] menu: Avoid cancelling the menu on GTK+ grabs inside the
+ GtkMenu
+
+Allows again sliders as menuitems, broken by commit 9b032073.
+
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=786029
+Bug-Ubuntu: https://launchpad.net/bugs/1712701
+Bug-Debian: https://bugs.debian.org/872687
+---
+ gtk/gtkmenu.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
+index 2308040ef2..c443cfeb22 100644
+--- a/gtk/gtkmenu.c
++++ b/gtk/gtkmenu.c
+@@ -6183,7 +6183,8 @@ gtk_menu_grab_notify (GtkWidget *widget,
+   group = gtk_window_get_group (GTK_WINDOW (toplevel));
+   grab = gtk_window_group_get_current_grab (group);
+ 
+-  if (GTK_MENU_SHELL (widget)->priv->active && !GTK_IS_MENU_SHELL (grab))
++  if (GTK_MENU_SHELL (widget)->priv->active && !GTK_IS_MENU_SHELL (grab) &&
++      !gtk_widget_is_ancestor (grab, widget))
+     gtk_menu_shell_cancel (GTK_MENU_SHELL (widget));
+ 
+   menu->priv->drag_scroll_started = FALSE;

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=52871&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/patches/series	[utf-8] Thu Aug 24 00:56:19 2017
@@ -6,3 +6,4 @@
 no-accessibility-dump.patch
 reftest-known-fail.patch
 gdk-x11-Check-if-we-have-access-to-GL-before-using-G.patch
+fix-gtk-menu-sliders.patch