# HG changeset patch
# User Kevin Stange <kevin@simguy.net>
# Date 1317514448 0
# Node ID 3555d352ee4a78399d0e519e046b1f0868bdb7f4
# Parent  9173ec5a45cf881f2830b5b6e4cb9c8eb2b5cb3b
Restore a union member lost in the merge due to struct hiding.

diff -r 9173ec5a45cf -r 3555d352ee4a libpurple/conversation.c
--- 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. */