Mercurial > pidgin
comparison libpurple/conversation.h @ 25734:0b13cf2b286e
merge of '1cff30b7f6954a59c5a89c859c10fa1c51feab8c'
and '2ac9276c340244737b9b0bbc93dd1a3299cd43ae'
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Sun, 12 Oct 2008 17:41:36 +0000 |
parents | c87f7c6ab57c |
children | d8452c0bec7b 22b8a92fb5ee |
comparison
equal
deleted
inserted
replaced
25733:51cbb9be484e | 25734:0b13cf2b286e |
---|---|
112 message should not be | 112 message should not be |
113 shown in conversations | 113 shown in conversations |
114 which are only open for | 114 which are only open for |
115 internal UI purposes | 115 internal UI purposes |
116 (e.g. for contact-aware | 116 (e.g. for contact-aware |
117 conversions). */ | 117 conversations). */ |
118 PURPLE_MESSAGE_NICK = 0x0020, /**< Contains your nick. */ | 118 PURPLE_MESSAGE_NICK = 0x0020, /**< Contains your nick. */ |
119 PURPLE_MESSAGE_NO_LOG = 0x0040, /**< Do not log. */ | 119 PURPLE_MESSAGE_NO_LOG = 0x0040, /**< Do not log. */ |
120 PURPLE_MESSAGE_WHISPER = 0x0080, /**< Whispered message. */ | 120 PURPLE_MESSAGE_WHISPER = 0x0080, /**< Whispered message. */ |
121 PURPLE_MESSAGE_ERROR = 0x0200, /**< Error message. */ | 121 PURPLE_MESSAGE_ERROR = 0x0200, /**< Error message. */ |
122 PURPLE_MESSAGE_DELAYED = 0x0400, /**< Delayed message. */ | 122 PURPLE_MESSAGE_DELAYED = 0x0400, /**< Delayed message. */ |