pidgin: d1328041: disapproval of revision '8e7b47f18e014b8...

[kstange at pidgin.im]

----------------------------------------------------------------------
Revision: d1328041ee003fdee29a0cf6ae44b44727a49bb8
Parent:   8e7b47f18e014b8e786f6b8e24ecfe6182130ddc
Author:   kstange at pidgin.im
Date:     10/01/11 20:05:00
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/d1328041ee003fdee29a0cf6ae44b44727a49bb8

Changelog: 

disapproval of revision '8e7b47f18e014b8e786f6b8e24ecfe6182130ddc'

Changes against parent 8e7b47f18e014b8e786f6b8e24ecfe6182130ddc

  patched  finch/gntconv.c
  patched  libpurple/conversation.h

-------------- next part --------------
============================================================
--- libpurple/conversation.h	59d38f2c8ee471651d4f8e9f3508ef68d7308b6d
+++ libpurple/conversation.h	44e5eee5936d9cf44746b6a4db49494d550f7aa7
@@ -53,6 +53,7 @@ typedef enum
 	PURPLE_CONV_TYPE_UNKNOWN = 0, /**< Unknown conversation type. */
 	PURPLE_CONV_TYPE_IM,          /**< Instant Message.           */
 	PURPLE_CONV_TYPE_CHAT,        /**< Chat room.                 */
+	PURPLE_CONV_TYPE_MISC,        /**< A misc. conversation.      */
 	PURPLE_CONV_TYPE_ANY          /**< Any type of conversation.  */
 
 } PurpleConversationType;
@@ -284,6 +285,8 @@ struct _PurpleConversation
 	{
 		PurpleConvIm   *im;       /**< IM-specific data.                  */
 		PurpleConvChat *chat;     /**< Chat-specific data.                */
+		void *misc;             /**< Misc. data.                        */
+
 	} u;
 
 	PurpleConversationUiOps *ui_ops;           /**< UI-specific operations. */
============================================================
--- finch/gntconv.c	bad80370fed25297fd93ba4b95447906c61dd93e
+++ finch/gntconv.c	98aff9b4030d0024b30284b7234049f7d135a8b3
@@ -801,6 +801,9 @@ finch_create_conversation(PurpleConversa
 		case PURPLE_CONV_TYPE_CHAT:
 			gnt_widget_set_name(ggc->window, "conversation-window-chat" );
 			break;
+		case PURPLE_CONV_TYPE_MISC:
+			gnt_widget_set_name(ggc->window, "conversation-window-misc" );
+			break;
 		case PURPLE_CONV_TYPE_ANY:
 			gnt_widget_set_name(ggc->window, "conversation-window-any" );
 			break;