diff -Nru gtk+3.0-3.10.8/debian/changelog gtk+3.0-3.10.8/debian/changelog --- gtk+3.0-3.10.8/debian/changelog 2014-11-21 19:13:09.000000000 +0100 +++ gtk+3.0-3.10.8/debian/changelog 2015-01-15 10:48:23.000000000 +0100 @@ -1,3 +1,11 @@ +gtk+3.0 (3.10.8-0ubuntu1.4) trusty; urgency=medium + + * debian/patches/no_popup_menu_in_gtk_window.patch + - Prevents the menu key from opening neverending menus and from taking + the focus away from the screensaver (LP: #1366790) + + -- Margarita Manterola Thu, 15 Jan 2015 10:47:19 +0100 + gtk+3.0 (3.10.8-0ubuntu1.3) trusty; urgency=medium * debian/patches/use-secrets-service-for-cups-auth_info.patch diff -Nru gtk+3.0-3.10.8/debian/patches/no_popup_menu_in_gtk_window.patch gtk+3.0-3.10.8/debian/patches/no_popup_menu_in_gtk_window.patch --- gtk+3.0-3.10.8/debian/patches/no_popup_menu_in_gtk_window.patch 1970-01-01 01:00:00.000000000 +0100 +++ gtk+3.0-3.10.8/debian/patches/no_popup_menu_in_gtk_window.patch 2015-01-15 10:46:45.000000000 +0100 @@ -0,0 +1,46 @@ +From: Matthias Clasen +Subject: [gtk+] Don't implement popup_menu in GtkWindow + + This leads to disastruous results, since each menu is itself + in a GtkWindow, so holding down the menu key leads to a neverending + cascade of menus on top of menus. + +Origin: upstream, https://git.gnome.org/browse/gtk+/commit/?id=1691bb741d50c90ee938f0b73fe81b0ca9bfd6d4 +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=722106 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=738828 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/trusty/+source/gtk+3.0/+bug/1366790 +Index: gtk+3.0-3.10.8/gtk/gtkwindow.c +=================================================================== +--- gtk+3.0-3.10.8.orig/gtk/gtkwindow.c 2015-01-15 10:39:19.000000000 +0100 ++++ gtk+3.0-3.10.8/gtk/gtkwindow.c 2015-01-15 10:42:29.101472325 +0100 +@@ -479,7 +479,6 @@ + #endif + static void gtk_window_set_theme_variant (GtkWindow *window); + +-static gboolean gtk_window_popup_menu (GtkWidget *widget); + static void gtk_window_do_popup (GtkWindow *window, + GdkEventButton *event); + +@@ -663,7 +662,6 @@ + widget_class->direction_changed = gtk_window_direction_changed; + widget_class->state_changed = gtk_window_state_changed; + widget_class->style_updated = gtk_window_style_updated; +- widget_class->popup_menu = gtk_window_popup_menu; + widget_class->get_preferred_width = gtk_window_get_preferred_width; + widget_class->get_preferred_width_for_height = gtk_window_get_preferred_width_for_height; + widget_class->get_preferred_height = gtk_window_get_preferred_height; +@@ -8301,14 +8299,6 @@ + 0, gtk_get_current_event_time ()); + } + +-static gboolean +-gtk_window_popup_menu (GtkWidget *widget) +-{ +- gtk_window_do_popup (GTK_WINDOW (widget), NULL); +- +- return TRUE; +-} +- + /********************************* + * Functions related to resizing * + *********************************/ diff -Nru gtk+3.0-3.10.8/debian/patches/series gtk+3.0-3.10.8/debian/patches/series --- gtk+3.0-3.10.8/debian/patches/series 2014-11-21 19:13:09.000000000 +0100 +++ gtk+3.0-3.10.8/debian/patches/series 2015-01-15 10:40:36.000000000 +0100 @@ -23,3 +23,4 @@ git-menu-binding-emit-submenu-close-after-activate.patch use-secrets-service-for-cups-auth_info.patch printing-initialize-auth_info.patch +no_popup_menu_in_gtk_window.patch