changeset 32235:fe20ff3d4e7a

Hide struct _PurpleConvIm.
author andrew.victor@mxit.com
date Sat, 01 Oct 2011 11:35:15 +0000
parents 1877fd446f8d
children c39583aad67c
files ChangeLog.API libpurple/conversation.c libpurple/conversation.h libpurple/server.c
diffstat 4 files changed, 17 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog.API	Sat Oct 01 11:29:43 2011 +0000
+++ b/ChangeLog.API	Sat Oct 01 11:35:15 2011 +0000
@@ -188,6 +188,7 @@
 		* struct _PidginImPane
 		* struct _PurpleAttentionType
 		* struct _PurpleConvChat
+		* struct _PurpleConvIm
 		* struct _PurpleMenuAction
 		* struct _PurplePounce
 		* struct _PurpleProxyInfo
--- a/libpurple/conversation.c	Sat Oct 01 11:29:43 2011 +0000
+++ b/libpurple/conversation.c	Sat Oct 01 11:35:15 2011 +0000
@@ -55,6 +55,21 @@
 	GHashTable *users;               /**< Hash table of the users in the room. */
 };
 
+/**
+ * Data specific to Instant Messages.
+ */
+struct _PurpleConvIm
+{
+	PurpleConversation *conv;            /**< The parent conversation.     */
+
+	PurpleTypingState typing_state;      /**< The current typing state.    */
+	guint  typing_timeout;             /**< The typing timer handle.     */
+	time_t type_again;                 /**< The type again time.         */
+	guint  send_typed_timeout;         /**< The type again timer handle. */
+
+	PurpleBuddyIcon *icon;               /**< The buddy icon.              */
+};
+
 static GList *conversations = NULL;
 static GList *ims = NULL;
 static GList *chats = NULL;
--- a/libpurple/conversation.h	Sat Oct 01 11:29:43 2011 +0000
+++ b/libpurple/conversation.h	Sat Oct 01 11:35:15 2011 +0000
@@ -250,21 +250,6 @@
 };
 
 /**
- * Data specific to Instant Messages.
- */
-struct _PurpleConvIm
-{
-	PurpleConversation *conv;            /**< The parent conversation.     */
-
-	PurpleTypingState typing_state;      /**< The current typing state.    */
-	guint  typing_timeout;             /**< The typing timer handle.     */
-	time_t type_again;                 /**< The type again time.         */
-	guint  send_typed_timeout;         /**< The type again timer handle. */
-
-	PurpleBuddyIcon *icon;               /**< The buddy icon.              */
-};
-
-/**
  * Data for "Chat Buddies"
  */
 struct _PurpleConvChatBuddy
--- a/libpurple/server.c	Sat Oct 01 11:29:43 2011 +0000
+++ b/libpurple/server.c	Sat Oct 01 11:35:15 2011 +0000
@@ -725,7 +725,7 @@
 	{
 		im = PURPLE_CONV_IM(conv);
 
-		if (im->typing_state == PURPLE_NOT_TYPING)
+		if (purple_conv_im_get_typing_state(im) == PURPLE_NOT_TYPING)
 			return;
 
 		purple_conv_im_stop_typing_timeout(im);