# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1257639270 0
# Node ID 28d5dd02302d3ccd27427267f445d55fa7c24709
# Parent  bd0956f17a92a365ee264ad9642439e33e98571d
* xmenu.c (Fx_popup_menu): Hide any tooltip before opening a menu.

diff -r bd0956f17a92 -r 28d5dd02302d src/ChangeLog
--- a/src/ChangeLog	Sun Nov 08 00:09:02 2009 +0000
+++ b/src/ChangeLog	Sun Nov 08 00:14:30 2009 +0000
@@ -1,7 +1,7 @@
-2009-11-07  Chong Yidong  <cyd@stupidchicken.com>
+2009-11-08  Chong Yidong  <cyd@stupidchicken.com>
 
 	* xmenu.c (Fx_popup_menu): Extract event timestamp.  Pass it to
-	xmenu_show.
+	xmenu_show.  Hide any tooltip before opening a menu.
 	(xmenu_show): New arg.  Pass it to create_and_show_popup_menu.
 	(create_and_show_popup_menu): New arg.  Pass it to gtk_menu_popup.
 
diff -r bd0956f17a92 -r 28d5dd02302d src/xmenu.c
--- a/src/xmenu.c	Sun Nov 08 00:09:02 2009 +0000
+++ b/src/xmenu.c	Sun Nov 08 00:14:30 2009 +0000
@@ -502,6 +502,9 @@
     }
 
 #ifdef HAVE_MENUS
+  /* Hide a previous tip, if any.  */
+  Fx_hide_tip ();
+
   /* Display them in a menu.  */
   BLOCK_INPUT;
 
@@ -1805,6 +1808,7 @@
 
   /* Display the menu.  */
   gtk_widget_show_all (menu);
+
   gtk_menu_popup (GTK_MENU (menu), 0, 0, pos_func, &popup_x_y, i,
 		  timestamp > 0 ? timestamp : gtk_get_current_event_time());