* xdisp.c (update_tool_bar): BLOCK_INPUT before calling

  tool_bar_items so GTK tool bar expose callback does not access items
  being updated.

diff --git a/src/ChangeLog b/src/ChangeLog
index b395f560ffe4330015e70408fe19660ff4a2ba55..3992e51cf2794150367de47fe37d74c4c1468541 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2003-04-23  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
+
+       * xdisp.c (update_tool_bar): BLOCK_INPUT before calling
+       tool_bar_items so GTK tool bar expose callback does not access items 
+       being updated.
+
 2003-04-18  Miles Bader  <miles@gnu.org>
 
        * data.c (Faset): Calculate nbytes earlier, to satisfy the now

diff --git a/src/xdisp.c b/src/xdisp.c
index 940db9ced315d55f9cd17eb3659d4d52b35bdb74..7c9a52cbba776388dcea6d2c0dd62165aaa60fcc 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -8152,8 +8152,10 @@ update_tool_bar (f, save_match_data)
          GCPRO1 (old_tool_bar);
 
          /* Build desired tool-bar items from keymaps.  */
+          BLOCK_INPUT;
          f->tool_bar_items
            = tool_bar_items (f->tool_bar_items, &f->n_tool_bar_items);
+          UNBLOCK_INPUT;
 
          /* Redisplay the tool-bar if we changed it.  */
          if (! NILP (Fequal (old_tool_bar, f->tool_bar_items)))