* src/gtkutil.c, src/nsterm.m: Fix bug#39808

Complete 3b4bd4be1d where I apparently failed to grep properly and
missed two more places where the dummy events were generated.

* src/nsterm.m ([EmacsView toolbarClicked:]):
* src/gtkutil.c (xg_tool_bar_callback): Don't emit dummy "prefix" events.

diff --git a/src/gtkutil.c b/src/gtkutil.c
index 5e7cf3d21148082de68f5d68a499a69f95e40e1f..338c6036c2c8f028177d4328a2a0d46656c8d589 100644 (file)
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -4398,13 +4398,6 @@ xg_tool_bar_callback (GtkWidget *w, gpointer client_data)
   key = AREF (f->tool_bar_items, idx + TOOL_BAR_ITEM_KEY);
   XSETFRAME (frame, f);
 
-  /* We generate two events here.  The first one is to set the prefix
-     to `(tool_bar)', see keyboard.c.  */
-  event.kind = TOOL_BAR_EVENT;
-  event.frame_or_window = frame;
-  event.arg = frame;
-  kbd_buffer_store_event (&event);
-
   event.kind = TOOL_BAR_EVENT;
   event.frame_or_window = frame;
   event.arg = key;

diff --git a/src/nsterm.m b/src/nsterm.m
index c0535825eeeddee3c86cbc9e23d58938952147d5..aefbb2721efaf66e0824b4a56ff3433e43d045d7 100644 (file)
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -8185,12 +8185,6 @@ not_in_argv (NSString *arg)
   if (!emacs_event)
     return self;
 
-  /* Send first event (for some reason two needed).  */
-  theEvent = [[self window] currentEvent];
-  emacs_event->kind = TOOL_BAR_EVENT;
-  XSETFRAME (emacs_event->arg, emacsframe);
-  EV_TRAILER (theEvent);
-
   emacs_event->kind = TOOL_BAR_EVENT;
   /* XSETINT (emacs_event->code, 0); */
   emacs_event->arg = AREF (emacsframe->tool_bar_items,