Mercurial > pidgin.yaz

diff libpurple/conversation.h @ 32715:9173ec5a45cf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '1b285d0b375fbd5e778db6bb852a7b089feb16a3' and 'd1328041ee003fdee29a0cf6ae44b44727a49bb8'
author Kevin Stange <kevin@simguy.net>
date Sun, 02 Oct 2011 00:06:40 +0000
parents 588f9b808a31 32eef2c3314a
children 75104780b1a3
line wrap: on
line diff
--- a/libpurple/conversation.h	Sat Oct 01 23:41:15 2011 +0000
+++ b/libpurple/conversation.h	Sun Oct 02 00:06:40 2011 +0000
@@ -53,6 +53,7 @@
 	PURPLE_CONV_TYPE_UNKNOWN = 0, /**< Unknown conversation type. */
 	PURPLE_CONV_TYPE_IM,          /**< Instant Message.           */
 	PURPLE_CONV_TYPE_CHAT,        /**< Chat room.                 */
+	PURPLE_CONV_TYPE_MISC,        /**< A misc. conversation.      */
 	PURPLE_CONV_TYPE_ANY          /**< Any type of conversation.  */
 
 } PurpleConversationType;