From 46030a84cf6551a62ccb46fb7ee6968ab3c1b3ca Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 29 Oct 2007 10:33:40 +0000 Subject: Upgrade GTK+ from 2.12.0 to 2.12.1 git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3012 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- .../gtk+/gtk+-2.12.0/menu-deactivate.patch | 51 ---------------------- 1 file changed, 51 deletions(-) delete mode 100644 meta/packages/gtk+/gtk+-2.12.0/menu-deactivate.patch (limited to 'meta/packages/gtk+/gtk+-2.12.0/menu-deactivate.patch') diff --git a/meta/packages/gtk+/gtk+-2.12.0/menu-deactivate.patch b/meta/packages/gtk+/gtk+-2.12.0/menu-deactivate.patch deleted file mode 100644 index cfb8849e9..000000000 --- a/meta/packages/gtk+/gtk+-2.12.0/menu-deactivate.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- gtk+-2.10.0/gtk/gtkmenushell.c.orig 2006-07-05 17:17:34.000000000 +0200 -+++ gtk+-2.10.0/gtk/gtkmenushell.c 2006-07-05 17:19:01.000000000 +0200 -@@ -42,7 +42,7 @@ - #include "gtkintl.h" - #include "gtkalias.h" - --#define MENU_SHELL_TIMEOUT 500 -+#define MENU_SHELL_TIMEOUT 2000 - - #define PACK_DIRECTION(m) \ - (GTK_IS_MENU_BAR (m) \ -@@ -203,6 +203,8 @@ - - G_DEFINE_TYPE (GtkMenuShell, gtk_menu_shell, GTK_TYPE_CONTAINER) - -+static int last_crossing_time; -+ - static void - gtk_menu_shell_class_init (GtkMenuShellClass *klass) - { -@@ -517,6 +519,7 @@ - gtk_grab_add (GTK_WIDGET (menu_shell)); - menu_shell->have_grab = TRUE; - menu_shell->active = TRUE; -+ last_crossing_time = 0; - } - } - -@@ -669,6 +672,13 @@ - menu_shell->activate_time = 0; - deactivate = FALSE; - } -+ -+ if (last_crossing_time != 0 -+ && ((event->time - last_crossing_time) < 500)) -+ { -+ last_crossing_time = 0; -+ deactivate = FALSE; -+ } - - if (deactivate) - { -@@ -716,6 +726,8 @@ - { - menu_item = gtk_get_event_widget ((GdkEvent*) event); - -+ last_crossing_time = event->time; -+ - if (!menu_item || - (GTK_IS_MENU_ITEM (menu_item) && - !_gtk_menu_item_is_selectable (menu_item))) -- cgit v1.2.3