Mercurial > pidgin
changeset 32234:1877fd446f8d
Hide struct _PurpleConvChat.
| author | andrew.victor@mxit.com |
|---|---|
| date | Sat, 01 Oct 2011 11:29:43 +0000 |
| parents | 1d09b9077181 |
| children | fe20ff3d4e7a |
| files | ChangeLog.API libpurple/conversation.c libpurple/conversation.h libpurple/protocols/zephyr/zephyr.c pidgin/gtkconv.c |
| diffstat | 5 files changed, 23 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog.API Sat Oct 01 11:02:15 2011 +0000 +++ b/ChangeLog.API Sat Oct 01 11:29:43 2011 +0000 @@ -187,6 +187,7 @@ * struct _PidginChatPane * struct _PidginImPane * struct _PurpleAttentionType + * struct _PurpleConvChat * struct _PurpleMenuAction * struct _PurplePounce * struct _PurpleProxyInfo
--- a/libpurple/conversation.c Sat Oct 01 11:02:15 2011 +0000 +++ b/libpurple/conversation.c Sat Oct 01 11:29:43 2011 +0000 @@ -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;
--- a/libpurple/conversation.h Sat Oct 01 11:02:15 2011 +0000 +++ b/libpurple/conversation.h Sat Oct 01 11:29:43 2011 +0000 @@ -265,26 +265,6 @@ }; /** - * 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
--- a/libpurple/protocols/zephyr/zephyr.c Sat Oct 01 11:02:15 2011 +0000 +++ b/libpurple/protocols/zephyr/zephyr.c Sat Oct 01 11:29:43 2011 +0000 @@ -2622,9 +2622,8 @@ * 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; }
--- a/pidgin/gtkconv.c Sat Oct 01 11:02:15 2011 +0000 +++ b/pidgin/gtkconv.c Sat Oct 01 11:29:43 2011 +0000 @@ -8185,7 +8185,7 @@ 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;