From: Jan Djärv <jan.h.d@swipnet.se>
Date: Tue, 28 Aug 2007 10:06:15 +0000 (+0000)
Subject: (xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
X-Git-Tag: emacs-pretest-22.1.90~886
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5f4a9ec610c5e9aa82c7a6fc03dc676ad4771a09;p=emacs.git

(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
so no Lisp code is executed.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 5ad9ac7d84e..d73437c7dfc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-28  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* gtkutil.c (xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
+	so no Lisp code is executed.
+
 2007-08-27  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
 	* macterm.c (x_draw_composite_glyph_string_foreground): Draw rectangle
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 7dc451a5d04..5ca8c8885b6 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -3615,7 +3615,7 @@ xg_tool_bar_item_expose_callback (w, event, client_data)
 }
 
 /* This callback is called when a tool bar shall be redrawn.
-   We need to update the tool bar from here in case the image cache
+   We need to update the images in case the image cache
    has deleted the pixmaps used in the tool bar.
    W is the GtkToolbar to be redrawn.
    EVENT is the expose event for W.
@@ -3629,7 +3629,8 @@ xg_tool_bar_expose_callback (w, event, client_data)
      GdkEventExpose *event;
      gpointer client_data;
 {
-  update_frame_tool_bar ((FRAME_PTR) client_data);
+  FRAME_PTR f = (FRAME_PTR) client_data;
+  SET_FRAME_GARBAGED (f);
   return FALSE;
 }