aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChong Yidong2006-11-04 03:08:35 +0000
committerChong Yidong2006-11-04 03:08:35 +0000
commitffbdf67b4c0bff0616b65d5365dc43a07f5d3f72 (patch)
tree63a15fc865ca01354107925b77f6f7165a0a1d94 /src
parentede4ac6a6a66892c6dcb448d81c5655c7325cc89 (diff)
downloademacs-ffbdf67b4c0bff0616b65d5365dc43a07f5d3f72.tar.gz
emacs-ffbdf67b4c0bff0616b65d5365dc43a07f5d3f72.zip
* gtkutil.c (update_frame_tool_bar): If icon image is invalid and
wicon is null, insert an empty button.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/gtkutil.c7
2 files changed, 11 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 73b654b920b..0d6f6838e8e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12006-11-03 Chong Yidong <cyd@stupidchicken.com>
2
3 * gtkutil.c (update_frame_tool_bar): If icon image is invalid and
4 wicon is null, insert an empty button.
5
12006-11-03 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> 62006-11-03 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2 7
3 * xterm.c (x_raise_frame): Send _NET_ACTIVE_WINDOW when raising the 8 * xterm.c (x_raise_frame): Send _NET_ACTIVE_WINDOW when raising the
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 07cc883fb83..f7b9f8c18f9 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -3720,7 +3720,12 @@ update_frame_tool_bar (f)
3720 3720
3721 if (img->load_failed_p || img->pixmap == None) 3721 if (img->load_failed_p || img->pixmap == None)
3722 { 3722 {
3723 if (wicon) gtk_widget_hide (wicon); 3723 if (wicon)
3724 gtk_widget_hide (wicon);
3725 else
3726 gtk_toolbar_insert (GTK_TOOLBAR (x->toolbar_widget),
3727 gtk_tool_button_new (NULL, ""),
3728 i);
3724 continue; 3729 continue;
3725 } 3730 }
3726 3731