Set the activate_time to 0, so that we handle a quick press/release

Thu Feb  3 14:46:01 2000  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkmenushell.c (gtk_menu_shell_button_release): Set
	the activate_time to 0, so that we handle a quick
	press/release press/release properly and don't suppress
        the second release. (Red Hat bug #7545)

8 files changed, 88 insertions, 29 deletions

diff --git a/ChangeLog b/ChangeLog
index 658c10c15..85488b178 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,16 @@
+Thu Feb  3 14:46:01 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkmenushell.c (gtk_menu_shell_button_release): Set
+	the activate_time to 0, so that we handle a quick
+	press/release press/release properly and don't suppress
+	the second release. (Red Hat bug #7545)
+
 Wed Feb  2 22:25:17 2000  Tim Janik  <timj@gtk.org>
 
-	* gtk/gtkctree.c (row_delete): 
-	(gtk_ctree_node_set_row_data_full): fixed very evil reentrancy bugs with
-	destruction notifier, *always* update internal structures *before*
-	calling user code.
+	* gtk/gtkctree.c (row_delete):
+	(gtk_ctree_node_set_row_data_full): fixed very evil reentrancy
+	bugs with destruction notifier, *always* update internal
+	structures *before* calling user code.
 
 Sun Jan 30 20:10:52 2000  Lars Hamann  <lars@gtk.org>
 
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 658c10c15..85488b178 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,9 +1,16 @@
+Thu Feb  3 14:46:01 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkmenushell.c (gtk_menu_shell_button_release): Set
+	the activate_time to 0, so that we handle a quick
+	press/release press/release properly and don't suppress
+	the second release. (Red Hat bug #7545)
+
 Wed Feb  2 22:25:17 2000  Tim Janik  <timj@gtk.org>
 
-	* gtk/gtkctree.c (row_delete): 
-	(gtk_ctree_node_set_row_data_full): fixed very evil reentrancy bugs with
-	destruction notifier, *always* update internal structures *before*
-	calling user code.
+	* gtk/gtkctree.c (row_delete):
+	(gtk_ctree_node_set_row_data_full): fixed very evil reentrancy
+	bugs with destruction notifier, *always* update internal
+	structures *before* calling user code.
 
 Sun Jan 30 20:10:52 2000  Lars Hamann  <lars@gtk.org>
 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 658c10c15..85488b178 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,9 +1,16 @@
+Thu Feb  3 14:46:01 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkmenushell.c (gtk_menu_shell_button_release): Set
+	the activate_time to 0, so that we handle a quick
+	press/release press/release properly and don't suppress
+	the second release. (Red Hat bug #7545)
+
 Wed Feb  2 22:25:17 2000  Tim Janik  <timj@gtk.org>
 
-	* gtk/gtkctree.c (row_delete): 
-	(gtk_ctree_node_set_row_data_full): fixed very evil reentrancy bugs with
-	destruction notifier, *always* update internal structures *before*
-	calling user code.
+	* gtk/gtkctree.c (row_delete):
+	(gtk_ctree_node_set_row_data_full): fixed very evil reentrancy
+	bugs with destruction notifier, *always* update internal
+	structures *before* calling user code.
 
 Sun Jan 30 20:10:52 2000  Lars Hamann  <lars@gtk.org>
 
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 658c10c15..85488b178 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,9 +1,16 @@
+Thu Feb  3 14:46:01 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkmenushell.c (gtk_menu_shell_button_release): Set
+	the activate_time to 0, so that we handle a quick
+	press/release press/release properly and don't suppress
+	the second release. (Red Hat bug #7545)
+
 Wed Feb  2 22:25:17 2000  Tim Janik  <timj@gtk.org>
 
-	* gtk/gtkctree.c (row_delete): 
-	(gtk_ctree_node_set_row_data_full): fixed very evil reentrancy bugs with
-	destruction notifier, *always* update internal structures *before*
-	calling user code.
+	* gtk/gtkctree.c (row_delete):
+	(gtk_ctree_node_set_row_data_full): fixed very evil reentrancy
+	bugs with destruction notifier, *always* update internal
+	structures *before* calling user code.
 
 Sun Jan 30 20:10:52 2000  Lars Hamann  <lars@gtk.org>
 
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 658c10c15..85488b178 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,9 +1,16 @@
+Thu Feb  3 14:46:01 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkmenushell.c (gtk_menu_shell_button_release): Set
+	the activate_time to 0, so that we handle a quick
+	press/release press/release properly and don't suppress
+	the second release. (Red Hat bug #7545)
+
 Wed Feb  2 22:25:17 2000  Tim Janik  <timj@gtk.org>
 
-	* gtk/gtkctree.c (row_delete): 
-	(gtk_ctree_node_set_row_data_full): fixed very evil reentrancy bugs with
-	destruction notifier, *always* update internal structures *before*
-	calling user code.
+	* gtk/gtkctree.c (row_delete):
+	(gtk_ctree_node_set_row_data_full): fixed very evil reentrancy
+	bugs with destruction notifier, *always* update internal
+	structures *before* calling user code.
 
 Sun Jan 30 20:10:52 2000  Lars Hamann  <lars@gtk.org>
 
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 658c10c15..85488b178 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,9 +1,16 @@
+Thu Feb  3 14:46:01 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkmenushell.c (gtk_menu_shell_button_release): Set
+	the activate_time to 0, so that we handle a quick
+	press/release press/release properly and don't suppress
+	the second release. (Red Hat bug #7545)
+
 Wed Feb  2 22:25:17 2000  Tim Janik  <timj@gtk.org>
 
-	* gtk/gtkctree.c (row_delete): 
-	(gtk_ctree_node_set_row_data_full): fixed very evil reentrancy bugs with
-	destruction notifier, *always* update internal structures *before*
-	calling user code.
+	* gtk/gtkctree.c (row_delete):
+	(gtk_ctree_node_set_row_data_full): fixed very evil reentrancy
+	bugs with destruction notifier, *always* update internal
+	structures *before* calling user code.
 
 Sun Jan 30 20:10:52 2000  Lars Hamann  <lars@gtk.org>
 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 658c10c15..85488b178 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,9 +1,16 @@
+Thu Feb  3 14:46:01 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkmenushell.c (gtk_menu_shell_button_release): Set
+	the activate_time to 0, so that we handle a quick
+	press/release press/release properly and don't suppress
+	the second release. (Red Hat bug #7545)
+
 Wed Feb  2 22:25:17 2000  Tim Janik  <timj@gtk.org>
 
-	* gtk/gtkctree.c (row_delete): 
-	(gtk_ctree_node_set_row_data_full): fixed very evil reentrancy bugs with
-	destruction notifier, *always* update internal structures *before*
-	calling user code.
+	* gtk/gtkctree.c (row_delete):
+	(gtk_ctree_node_set_row_data_full): fixed very evil reentrancy
+	bugs with destruction notifier, *always* update internal
+	structures *before* calling user code.
 
 Sun Jan 30 20:10:52 2000  Lars Hamann  <lars@gtk.org>
 
diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c
index 0fe6c6b12..784a89fe8 100644
--- a/gtk/gtkmenushell.c
+++ b/gtk/gtkmenushell.c
@@ -494,7 +494,17 @@ gtk_menu_shell_button_release (GtkWidget      *widget,
 	    }
 	}
       else
-	deactivate = FALSE;
+	{
+	  /* We only ever want to prevent deactivation on the first
+           * press/release. Setting the time to zero is a bit of a
+	   * hack, since we could be being triggered in the first
+	   * few fractions of a second after a server time wraparound.
+	   * the chances of that happening are ~1/10^6, without
+	   * serious harm if we lose.
+	   */
+	  menu_shell->activate_time = 0;
+	  deactivate = FALSE;
+	}
       
       /* If the button click was very fast, or we ended up on a submenu,
        * leave the menu up