[Gaim-commits] CVS: gaim/src gtkconv.c,1.529,1.530

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1897/src

Modified Files:
	gtkconv.c 
Log Message:
From siege.


Index: gtkconv.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkconv.c,v
retrieving revision 1.529
retrieving revision 1.530
diff -u -d -p -r1.529 -r1.530
--- gtkconv.c	9 Mar 2005 00:52:59 -0000	1.529
+++ gtkconv.c	15 Mar 2005 02:39:38 -0000	1.530
@@ -2727,7 +2727,8 @@ gray_stuff_out(GaimConversation *conv)
 		/* 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;