gaim/gaim

Fix the image button and conversation features stuff from siege, and
oldstatus
2005-03-16, Stu Tomlinson
a7cb4634e839
Parents 2d38708b8686
Children f7f073ae0589
Fix the image button and conversation features stuff from siege, and
remove the chat buddy typing flag for now because it would cause confusion
2 files changed, 3 insertions(+), 3 deletions(-)
  • +1 -2
    src/conversation.h
  • +2 -1
    src/gtkconv.c
    • --- a/src/conversation.h Wed Mar 16 20:54:07 2005 -0500
    +++ b/src/conversation.h Wed Mar 16 21:03:34 2005 -0500
    @@ -130,8 +130,7 @@
    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"
    --- a/src/gtkconv.c Wed Mar 16 20:54:07 2005 -0500
    +++ b/src/gtkconv.c Wed Mar 16 21:03:34 2005 -0500
    @@ -2847,7 +2847,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;