* xmenu.c (x_menu_set_in_use): Fix incorrect assumption.

diff --git a/src/ChangeLog b/src/ChangeLog
index a1e5f3a22007206677374d823e6a508fd18cf80f..db1f1c82f35327d2c20a4388b86b596ba317d92d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -21,8 +21,6 @@
        (compare_window_configurations): Remove unused locals.
        * xfns.c (x_set_scroll_bar_default_width): Remove unused locals.
        * xmenu.c (x_menu_set_in_use): Define only if USE_GTK || USE_MOTIF.
-       Omit no-longer-needed #ifdef USE_X_TOOLKIT, since USE_X_TOOLKIT is
-       implied by USE_GTK || USE_MOTIF.
        (dialog_selection_callback) [!USE_GTK]: Prefer intptr_t for integers
        the same widths as pointers.  This follows up on the 2011-05-06 patch.
        * xterm.c (x_alloc_lighter_color_for_widget): Define only if USE_LUCID.

diff --git a/src/xmenu.c b/src/xmenu.c
index db1d8823a7ecf77729d9a1cd2f65556df8ee5524..1cb71187c0cb4e49058302c3577330bb1fde2402 100644 (file)
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -356,8 +356,10 @@ x_menu_set_in_use (int in_use)
 {
   menu_items_inuse = in_use ? Qt : Qnil;
   popup_activated_flag = in_use;
+#ifdef USE_X_TOOLKIT
   if (popup_activated_flag)
     x_activate_timeout_atimer ();
+#endif
 }
 
 #endif