pidgin: 9f9babc0: Restore a union member lost in the merge...

[kstange at pidgin.im]

----------------------------------------------------------------------
Revision: 9f9babc0fb0181cede172177bc9a2f065d96dbd4
Parent:   bfc65d29c419fdc7f739266b96e1fbb001ef07c6
Author:   kstange at pidgin.im
Date:     10/01/11 20:14:08
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/9f9babc0fb0181cede172177bc9a2f065d96dbd4

Changelog: 

Restore a union member lost in the merge due to struct hiding.

Changes against parent bfc65d29c419fdc7f739266b96e1fbb001ef07c6

  patched  libpurple/conversation.c

-------------- next part --------------
============================================================
--- libpurple/conversation.c	10e36f0b1dcd8c41eca3bad912c5b222ef0efaf3
+++ libpurple/conversation.c	420a11ae3faf2b04888d1fecbeb677fe06b96fab
@@ -133,6 +133,8 @@ struct _PurpleConversation
 	{
 		PurpleConvIm   *im;       /**< IM-specific data.                  */
 		PurpleConvChat *chat;     /**< Chat-specific data.                */
+		void *misc;               /**< Misc. data.                        */
+
 	} u;
 
 	PurpleConversationUiOps *ui_ops;           /**< UI-specific operations. */