pidgin: 3c4e50a5: Hide struct _PurpleConvIm.

andrew.victor at mxit.com andrew.victor at mxit.com
Sat Oct 1 09:55:52 EDT 2011


----------------------------------------------------------------------
Revision: 3c4e50a528643abc97851d745a3eb8b0e24341ba
Parent:   74d9dda43c51c7ec355a70a7f44f011f727c0ec9
Author:   andrew.victor at mxit.com
Date:     10/01/11 07:35:15
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/3c4e50a528643abc97851d745a3eb8b0e24341ba

Changelog: 

Hide struct _PurpleConvIm.


Changes against parent 74d9dda43c51c7ec355a70a7f44f011f727c0ec9

  patched  ChangeLog.API
  patched  libpurple/conversation.c
  patched  libpurple/conversation.h
  patched  libpurple/server.c

-------------- next part --------------
============================================================
--- libpurple/server.c	7ae5301bfdcdedf3703a06afb4ea49959bd8ed8a
+++ libpurple/server.c	33b8e22d42988584b0fe44df95bd952fb58e4c78
@@ -725,7 +725,7 @@ void serv_got_typing_stopped(PurpleConne
 	{
 		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);
============================================================
--- libpurple/conversation.c	de7015c8ae5284a330e8ac39a5fea5b8cd703a18
+++ libpurple/conversation.c	5469961160cd0730d899b411fd4d21390345bfcb
@@ -55,6 +55,21 @@ struct _PurpleConvChat
 	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;
============================================================
--- libpurple/conversation.h	dcc7a90f70e8496ebdd28df4d1efe8ab0322cd74
+++ libpurple/conversation.h	d800aaf793a599867dc82b3ace4311e5ef1021e8
@@ -250,21 +250,6 @@ struct _PurpleConversationUiOps
 };
 
 /**
- * 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
============================================================
--- ChangeLog.API	b94b2d210b51b6b8e871cc76cd4e6b9df9cfd23f
+++ ChangeLog.API	7f7e3ad46d13852aca59c87252353911da1da284
@@ -188,6 +188,7 @@ version 3.0.0 (??/??/????):
 		* struct _PidginImPane
 		* struct _PurpleAttentionType
 		* struct _PurpleConvChat
+		* struct _PurpleConvIm
 		* struct _PurpleMenuAction
 		* struct _PurplePounce
 		* struct _PurpleProxyInfo


More information about the Commits mailing list