pidgin: adf0f379: Hide struct _PurpleConversation.

[andrew.victor at mxit.com]

----------------------------------------------------------------------
Revision: adf0f379818a066c40338a0be7251042bbb959dd
Parent:   fa663cc35615b2035b66787a7f89127ae3ba2605
Author:   andrew.victor at mxit.com
Date:     10/01/11 12:48:40
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/adf0f379818a066c40338a0be7251042bbb959dd

Changelog: 

Hide struct _PurpleConversation.


Changes against parent fa663cc35615b2035b66787a7f89127ae3ba2605

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

-------------- next part --------------
============================================================
--- libpurple/conversation.c	8b3d454213792721d08a56f753a90929cbf5cfeb
+++ libpurple/conversation.c	0369509671c3181e2ca1be743b731b766e3f98b2
@@ -110,7 +110,41 @@ struct _PurpleConvChatBuddy
 	gpointer ui_data;
 };
 
+/**
+ * A core representation of a conversation between two or more people.
+ *
+ * The conversation can be an IM or a chat.
+ */
+struct _PurpleConversation
+{
+	PurpleConversationType type;  /**< The type of conversation.          */
 
+	PurpleAccount *account;       /**< The user using this conversation.  */
+
+
+	char *name;                 /**< The name of the conversation.      */
+	char *title;                /**< The window title.                  */
+
+	gboolean logging;           /**< The status of logging.             */
+
+	GList *logs;                /**< This conversation's logs           */
+
+	union
+	{
+		PurpleConvIm   *im;       /**< IM-specific data.                  */
+		PurpleConvChat *chat;     /**< Chat-specific data.                */
+	} u;
+
+	PurpleConversationUiOps *ui_ops;           /**< UI-specific operations. */
+	void *ui_data;                           /**< UI-specific data.       */
+
+	GHashTable *data;                        /**< Plugin-specific data.   */
+
+	PurpleConnectionFlags features; /**< The supported features */
+	GList *message_history;         /**< Message history, as a GList of PurpleConvMessage's */
+};
+
+
 static GList *conversations = NULL;
 static GList *ims = NULL;
 static GList *chats = NULL;
============================================================
--- libpurple/conversation.h	59d38f2c8ee471651d4f8e9f3508ef68d7308b6d
+++ libpurple/conversation.h	19eab0b5af31c2dccd97e212b2521add3f6ed120
@@ -261,40 +261,6 @@ struct _PurpleConvMessage
 	char *alias;
 };
 
-/**
- * A core representation of a conversation between two or more people.
- *
- * The conversation can be an IM or a chat.
- */
-struct _PurpleConversation
-{
-	PurpleConversationType type;  /**< The type of conversation.          */
-
-	PurpleAccount *account;       /**< The user using this conversation.  */
-
-
-	char *name;                 /**< The name of the conversation.      */
-	char *title;                /**< The window title.                  */
-
-	gboolean logging;           /**< The status of logging.             */
-
-	GList *logs;                /**< This conversation's logs           */
-
-	union
-	{
-		PurpleConvIm   *im;       /**< IM-specific data.                  */
-		PurpleConvChat *chat;     /**< Chat-specific data.                */
-	} u;
-
-	PurpleConversationUiOps *ui_ops;           /**< UI-specific operations. */
-	void *ui_data;                           /**< UI-specific data.       */
-
-	GHashTable *data;                        /**< Plugin-specific data.   */
-
-	PurpleConnectionFlags features; /**< The supported features */
-	GList *message_history;         /**< Message history, as a GList of PurpleConvMessage's */
-};
-
 #ifdef __cplusplus
 extern "C" {
 #endif
============================================================
--- pidgin/gtkconv.c	54d5465ce71ade2c4a39b496382d99c4ecc9f535
+++ pidgin/gtkconv.c	2745238db3c74c773815ff86fa10c9ced8eb531f
@@ -1425,16 +1425,14 @@ menu_logging_cb(gpointer data, guint act
 
 		purple_conversation_write(conv, NULL,
 								_("Logging started. Future messages in this conversation will be logged."),
-								conv->logs ? (PURPLE_MESSAGE_SYSTEM) :
-								             (PURPLE_MESSAGE_SYSTEM | PURPLE_MESSAGE_NO_LOG),
+								PURPLE_MESSAGE_SYSTEM,
 								time(NULL));
 	}
 	else
 	{
 		purple_conversation_write(conv, NULL,
 								_("Logging stopped. Future messages in this conversation will not be logged."),
-								conv->logs ? (PURPLE_MESSAGE_SYSTEM) :
-								             (PURPLE_MESSAGE_SYSTEM | PURPLE_MESSAGE_NO_LOG),
+								PURPLE_MESSAGE_SYSTEM,
 								time(NULL));
 
 		/* Disable the logging second, so that the above message can be logged. */
============================================================
--- ChangeLog.API	f13a2b766148dee579d054eede6d4bf12538693c
+++ ChangeLog.API	aeaa79078aeb1a9f1e0fa34cc04d82388f832be8
@@ -192,6 +192,7 @@ version 3.0.0 (??/??/????):
 		* struct _PidginChatPane
 		* struct _PidginImPane
 		* struct _PurpleAttentionType
+		* struct _PurpleConversation
 		* struct _PurpleConvChat
 		* struct _PurpleConvChatBuddy
 		* struct _PurpleConvIm