Index: src/conversation.h =================================================================== RCS file: /cvsroot/gaim/gaim/src/conversation.h,v retrieving revision 1.52.2.1 diff -u -p -r1.52.2.1 conversation.h --- src/conversation.h 7 Mar 2005 18:36:16 -0000 1.52.2.1 +++ src/conversation.h 17 Mar 2005 01:53:53 -0000 @@ -130,8 +130,7 @@ typedef enum GAIM_CBFLAGS_VOICE = 0x0001, /**< Voiced user or "Participant" */ GAIM_CBFLAGS_HALFOP = 0x0002, /**< Half-op */ GAIM_CBFLAGS_OP = 0x0004, /**< Channel Op or Moderator */ - GAIM_CBFLAGS_FOUNDER = 0x0008, /**< Channel Founder */ - GAIM_CBFLAGS_TYPING = 0x0010, /**< Currently typing */ + GAIM_CBFLAGS_FOUNDER = 0x0008 /**< Channel Founder */ } GaimConvChatBuddyFlags; #include "account.h" Index: src/gtkconv.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkconv.c,v retrieving revision 1.471.2.15 diff -u -p -r1.471.2.15 gtkconv.c --- src/gtkconv.c 7 Mar 2005 18:36:16 -0000 1.471.2.15 +++ src/gtkconv.c 17 Mar 2005 01:53:55 -0000 @@ -2847,7 +2847,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;