Mercurial > pidgin.yaz
changeset 10698:2f646d020011
[gaim-migrate @ 12253]
From siege.
committer: Tailor Script <tailor@pidgin.im>
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Tue, 15 Mar 2005 02:39:38 +0000 |
| parents | 9b50ea54f3bb |
| children | c8b4bf3bf9e5 |
| files | src/gtkconv.c |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gtkconv.c Tue Mar 15 02:04:53 2005 +0000 +++ b/src/gtkconv.c Tue Mar 15 02:39:38 2005 +0000 @@ -2727,7 +2727,8 @@ /* Deal with the toolbar */ if (conv->features & GAIM_CONNECTION_HTML) { buttons = GTK_IMHTML_ALL; /* Everything on */ - if (!(prpl_info->options & OPT_PROTO_IM_IMAGE)) + if (!(prpl_info->options & OPT_PROTO_IM_IMAGE) || + conv->features & GAIM_CONNECTION_NO_IMAGES) buttons &= ~GTK_IMHTML_IMAGE; if (conv->features & GAIM_CONNECTION_NO_BGCOLOR) buttons &= ~GTK_IMHTML_BACKCOLOR;