pidgin: 74d9dda4: Hide struct _PurpleConvChat.

[andrew.victor at mxit.com]

----------------------------------------------------------------------
Revision: 74d9dda43c51c7ec355a70a7f44f011f727c0ec9
Parent:   79787dbaaadd121183a9725c604e0a64efbd5404
Author:   andrew.victor at mxit.com
Date:     10/01/11 07:29:43
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/74d9dda43c51c7ec355a70a7f44f011f727c0ec9

Changelog: 

Hide struct _PurpleConvChat.


Changes against parent 79787dbaaadd121183a9725c604e0a64efbd5404

  patched  ChangeLog.API
  patched  libpurple/conversation.c
  patched  libpurple/conversation.h
  patched  libpurple/protocols/zephyr/zephyr.c
  patched  pidgin/gtkconv.c

-------------- next part --------------
============================================================
--- libpurple/conversation.c	0a9c5f08404bbde184536fe5c9989efbace4b59c
+++ libpurple/conversation.c	de7015c8ae5284a330e8ac39a5fea5b8cd703a18
@@ -35,6 +35,26 @@
 
 #define SEND_TYPED_TIMEOUT_SECONDS 5
 
+/**
+ * Data specific to Chats.
+ */
+struct _PurpleConvChat
+{
+	PurpleConversation *conv;          /**< The parent conversation.      */
+
+	GList *in_room;                  /**< The users in the room.
+	                                  *   @deprecated Will be removed in 3.0.0
+									  */
+	GList *ignored;                  /**< Ignored users.                */
+	char  *who;                      /**< The person who set the topic. */
+	char  *topic;                    /**< The topic.                    */
+	int    id;                       /**< The chat ID.                  */
+	char *nick;                      /**< Your nick in this chat.       */
+
+	gboolean left;                   /**< We left the chat and kept the window open */
+	GHashTable *users;               /**< Hash table of the users in the room. */
+};
+
 static GList *conversations = NULL;
 static GList *ims = NULL;
 static GList *chats = NULL;
============================================================
--- libpurple/protocols/zephyr/zephyr.c	c3673c54018f2f157090872961a266e9ec750ee9
+++ libpurple/protocols/zephyr/zephyr.c	3a8e1bff516fc37654cf0afd6792a08e91d9b6df
@@ -2622,9 +2622,8 @@ static PurpleCmdRet zephyr_purple_cmd_in
 	 * one word isn't ideal either.	 */
 
 	PurpleConvChat *gcc = purple_conversation_get_chat_data(conv);
-	int id = gcc->id;
 	const char* instance = args[0];
-	zephyr_chat_set_topic(purple_conversation_get_gc(conv),id,instance);
+	zephyr_chat_set_topic(purple_conversation_get_gc(conv),purple_conv_chat_get_id(gcc),instance);
 	return PURPLE_CMD_RET_OK;
 }
 
============================================================
--- libpurple/conversation.h	5cb6a364b3c3fca8a9ce02f5545041b8f8be0c8f
+++ libpurple/conversation.h	dcc7a90f70e8496ebdd28df4d1efe8ab0322cd74
@@ -265,26 +265,6 @@ struct _PurpleConvIm
 };
 
 /**
- * Data specific to Chats.
- */
-struct _PurpleConvChat
-{
-	PurpleConversation *conv;          /**< The parent conversation.      */
-
-	GList *in_room;                  /**< The users in the room.
-	                                  *   @deprecated Will be removed in 3.0.0
-									  */
-	GList *ignored;                  /**< Ignored users.                */
-	char  *who;                      /**< The person who set the topic. */
-	char  *topic;                    /**< The topic.                    */
-	int    id;                       /**< The chat ID.                  */
-	char *nick;                      /**< Your nick in this chat.       */
-
-	gboolean left;                   /**< We left the chat and kept the window open */
-	GHashTable *users;               /**< Hash table of the users in the room. */
-};
-
-/**
  * Data for "Chat Buddies"
  */
 struct _PurpleConvChatBuddy
============================================================
--- pidgin/gtkconv.c	101988e95423434c7feb6b0dfe2612e38ec43f48
+++ pidgin/gtkconv.c	89a4e4e8367c49b3cf9b9ceb5e639196ae987892
@@ -8185,7 +8185,7 @@ gboolean pidgin_conv_attach_to_conversat
 
 	if (conv->type == PURPLE_CONV_TYPE_CHAT) {
 		pidgin_conv_update_fields(conv, PIDGIN_CONV_TOPIC);
-		pidgin_conv_chat_add_users(conv, PURPLE_CONV_CHAT(conv)->in_room, TRUE);
+		pidgin_conv_chat_add_users(conv, purple_conv_chat_get_users(PURPLE_CONV_CHAT(conv)), TRUE);
 	}
 
 	return TRUE;
============================================================
--- ChangeLog.API	577decb5bdb6cd78899fed97e25f2b71834c269b
+++ ChangeLog.API	b94b2d210b51b6b8e871cc76cd4e6b9df9cfd23f
@@ -187,6 +187,7 @@ version 3.0.0 (??/??/????):
 		* struct _PidginChatPane
 		* struct _PidginImPane
 		* struct _PurpleAttentionType
+		* struct _PurpleConvChat
 		* struct _PurpleMenuAction
 		* struct _PurplePounce
 		* struct _PurpleProxyInfo