aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan Djärv2007-08-28 10:06:15 +0000
committerJan Djärv2007-08-28 10:06:15 +0000
commit5f4a9ec610c5e9aa82c7a6fc03dc676ad4771a09 (patch)
tree49979e5a84c8e9c143ec215460090eac2c063bd8 /src
parentfbd4de656d455bce5d8c12422d2c33af8a9c190f (diff)
downloademacs-5f4a9ec610c5e9aa82c7a6fc03dc676ad4771a09.tar.gz
emacs-5f4a9ec610c5e9aa82c7a6fc03dc676ad4771a09.zip
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
so no Lisp code is executed.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/gtkutil.c5
2 files changed, 8 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 5ad9ac7d84e..d73437c7dfc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12007-08-28 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2
3 * gtkutil.c (xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
4 so no Lisp code is executed.
5
12007-08-27 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> 62007-08-27 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
2 7
3 * macterm.c (x_draw_composite_glyph_string_foreground): Draw rectangle 8 * 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)
3615} 3615}
3616 3616
3617/* This callback is called when a tool bar shall be redrawn. 3617/* This callback is called when a tool bar shall be redrawn.
3618 We need to update the tool bar from here in case the image cache 3618 We need to update the images in case the image cache
3619 has deleted the pixmaps used in the tool bar. 3619 has deleted the pixmaps used in the tool bar.
3620 W is the GtkToolbar to be redrawn. 3620 W is the GtkToolbar to be redrawn.
3621 EVENT is the expose event for W. 3621 EVENT is the expose event for W.
@@ -3629,7 +3629,8 @@ xg_tool_bar_expose_callback (w, event, client_data)
3629 GdkEventExpose *event; 3629 GdkEventExpose *event;
3630 gpointer client_data; 3630 gpointer client_data;
3631{ 3631{
3632 update_frame_tool_bar ((FRAME_PTR) client_data); 3632 FRAME_PTR f = (FRAME_PTR) client_data;
3633 SET_FRAME_GARBAGED (f);
3633 return FALSE; 3634 return FALSE;
3634} 3635}
3635 3636