* xmenu.c (Fx_popup_menu): Hide any tooltip before opening a menu.

diff --git a/src/ChangeLog b/src/ChangeLog
index bc209cb284fe3108ea4e50de60c78bed9638294f..9fb03a341e0c3ad3c5bec92827bdb95c50fb9902 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/xmenu.c b/src/xmenu.c
index 080930a4e783881160ee219e5652748af0d214cf..d8493283440d6acf2cdb36c5bc9d887365b0f373 100644 (file)
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -502,6 +502,9 @@ no quit occurs and `x-popup-menu' returns nil.  */)
     }
 
 #ifdef HAVE_MENUS
+  /* Hide a previous tip, if any.  */
+  Fx_hide_tip ();
+
   /* Display them in a menu.  */
   BLOCK_INPUT;
 
@@ -1805,6 +1808,7 @@ create_and_show_popup_menu (f, first_wv, x, y, for_click, timestamp)
 
   /* 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());