Mercurial > pidgin.yaz

comparison 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
comparison
equal deleted inserted replaced
32714:a34977b4d858 32715:9173ec5a45cf
51 typedef enum 51 typedef enum
52 { 52 {
53 PURPLE_CONV_TYPE_UNKNOWN = 0, /**< Unknown conversation type. */ 53 PURPLE_CONV_TYPE_UNKNOWN = 0, /**< Unknown conversation type. */
54 PURPLE_CONV_TYPE_IM, /**< Instant Message. */ 54 PURPLE_CONV_TYPE_IM, /**< Instant Message. */
55 PURPLE_CONV_TYPE_CHAT, /**< Chat room. */ 55 PURPLE_CONV_TYPE_CHAT, /**< Chat room. */
56 PURPLE_CONV_TYPE_MISC, /**< A misc. conversation. */
56 PURPLE_CONV_TYPE_ANY /**< Any type of conversation. */ 57 PURPLE_CONV_TYPE_ANY /**< Any type of conversation. */
57 58
58 } PurpleConversationType; 59 } PurpleConversationType;
59 60
60 /** 61 /**