# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1110854378 0
# Node ID 2f646d020011007cf0818dec9b757b4eb050412c
# Parent  9b50ea54f3bb514d93c17a8c2efeb0096092678e
[gaim-migrate @ 12253]
From siege.

committer: Tailor Script <tailor@pidgin.im>

diff -r 9b50ea54f3bb -r 2f646d020011 src/gtkconv.c
--- 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;