summaryrefslogtreecommitdiff
path: root/libpurple/conversation.h
diff options
context:
space:
mode:
authorKa-Hing Cheung <khc@pidgin.im>2007-11-10 04:52:20 +0000
committerKa-Hing Cheung <khc@pidgin.im>2007-11-10 04:52:20 +0000
commit62ffec02e46f7e99b55f8ec373979f585a3c27b5 (patch)
treece468738afbd3effd94aa673c36da2dfe88a13c1 /libpurple/conversation.h
parent5bfac56f1f4c3a142a763db5e11d61c22272ce63 (diff)
parent92a476b397218faa9b99438f8a3633c858e4ebbd (diff)
downloadpidgin-62ffec02e46f7e99b55f8ec373979f585a3c27b5.tar.gz
propagate from branch 'im.pidgin.pidgin.next.minor' (head 2f91b326b3f073672c2475a8c30a06826da9b82f)
to branch 'im.pidgin.pidgin' (head 326d5b91950b3d78c445722f6d726cfa6b1c525d)
Diffstat (limited to 'libpurple/conversation.h')
-rw-r--r--libpurple/conversation.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/libpurple/conversation.h b/libpurple/conversation.h
index a624b7ea5d..dae34455de 100644
--- a/libpurple/conversation.h
+++ b/libpurple/conversation.h
@@ -297,6 +297,8 @@ struct _PurpleConvMessage
char *what;
PurpleMessageFlags flags;
time_t when;
+ PurpleConversation *conv; /**< @since 2.3.0 */
+ char *alias; /**< @since 2.3.0 */
};
/**