diff --git a/debian/changelog b/debian/changelog index ca84b4d576..a9f5380a7c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ gtk+3.0 (3.22.20-1) UNRELEASED; urgency=medium * New upstream release. + * debian/patches/fix-gtk-menu-sliders.patch: + + Removed, applied upstream. -- Emilio Pozuelo Monfort Sat, 09 Sep 2017 12:36:19 +0200 diff --git a/debian/patches/fix-gtk-menu-sliders.patch b/debian/patches/fix-gtk-menu-sliders.patch deleted file mode 100644 index 3dc2d5db70..0000000000 --- a/debian/patches/fix-gtk-menu-sliders.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b9c154ed207d0c8dfa0929a4df1cf2a269cbb9a1 Mon Sep 17 00:00:00 2001 -From: Carlos Garnacho -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; diff --git a/debian/patches/series b/debian/patches/series index 5b44732aa3..7d510f5526 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,4 +6,3 @@ 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