Mercurial > pidgin

diff libpurple/conversation.c @ 32254:3555d352ee4a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Restore a union member lost in the merge due to struct hiding.
author Kevin Stange <kevin@simguy.net>
date Sun, 02 Oct 2011 00:14:08 +0000
parents 10e5000326a5
children 2ec94166be43
line wrap: on
line diff
--- a/libpurple/conversation.c	Sun Oct 02 00:06:40 2011 +0000
+++ b/libpurple/conversation.c	Sun Oct 02 00:14:08 2011 +0000
@@ -133,6 +133,8 @@
 	{
 		PurpleConvIm   *im;       /**< IM-specific data.                  */
 		PurpleConvChat *chat;     /**< Chat-specific data.                */
+		void *misc;               /**< Misc. data.                        */
+
 	} u;
 
 	PurpleConversationUiOps *ui_ops;           /**< UI-specific operations. */