Mercurial > pidgin.yaz
changeset 31699:a3bfd9439d37
merge of '974d79cf8eb22b7138c9a3d7313e89585fd8b443'
and 'a657534f694305a613db4946ca8ea9ab4c8f1c1d'
| author | Evan Schoenberg <evan.s@dreskin.net> |
|---|---|
| date | Mon, 21 Feb 2011 22:56:48 +0000 |
| parents | 5523e81329c2 (diff) 6b2b8cc8e7ae (current diff) |
| children | ae838d29c897 |
| files | |
| diffstat | 1 files changed, 1 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/conversation.h Mon Feb 21 09:45:47 2011 +0000 +++ b/libpurple/conversation.h Mon Feb 21 22:56:48 2011 +0000 @@ -139,8 +139,7 @@ PURPLE_CBFLAGS_HALFOP = 0x0002, /**< Half-op */ PURPLE_CBFLAGS_OP = 0x0004, /**< Channel Op or Moderator */ PURPLE_CBFLAGS_FOUNDER = 0x0008, /**< Channel Founder */ - PURPLE_CBFLAGS_TYPING = 0x0010, /**< Currently typing */ - PURPLE_CBFLAGS_AWAY = 0x0020 /**< Currently away. @since 2.8.0 */ + PURPLE_CBFLAGS_TYPING = 0x0010 /**< Currently typing */ } PurpleConvChatBuddyFlags;