Mercurial > emacs
comparison src/gtkutil.c @ 90650:02cf29720f31
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 490-504)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 161-163)
- Update from CVS
- Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-130
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Tue, 07 Nov 2006 23:22:48 +0000 |
| parents | 7eeafaaa9eab 7c60775b5a52 |
| children | f1d13e615070 |
comparison
equal
deleted
inserted
replaced
| 90649:d53934e7ddef | 90650:02cf29720f31 |
|---|---|
| 3718 img = IMAGE_FROM_ID (f, img_id); | 3718 img = IMAGE_FROM_ID (f, img_id); |
| 3719 prepare_image_for_display (f, img); | 3719 prepare_image_for_display (f, img); |
| 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 |
| 3727 if (! wicon) | 3732 if (! wicon) |
| 3728 { | 3733 { |