# HG changeset patch # User andrew.victor@mxit.com # Date 1317468915 0 # Node ID fe20ff3d4e7aab53562610a488881d317c0df88f # Parent 1877fd446f8d3c5adb3a84ee12d3f1cb1828ec3e Hide struct _PurpleConvIm. diff -r 1877fd446f8d -r fe20ff3d4e7a ChangeLog.API --- 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 diff -r 1877fd446f8d -r fe20ff3d4e7a libpurple/conversation.c --- 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; diff -r 1877fd446f8d -r fe20ff3d4e7a libpurple/conversation.h --- 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 diff -r 1877fd446f8d -r fe20ff3d4e7a libpurple/server.c --- 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);