Mercurial > pidgin.yaz
changeset 32168:4dabe4bdfb29
conversation: Strip off the exposed function pointers.
Getting that into a useful form would take a bit more planning
than I was hoping.
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Tue, 21 Jun 2011 01:40:54 +0000 |
| parents | 5e173ccbfdb8 |
| children | 84ac2406bb10 |
| files | ChangeLog.API libpurple/conversation.c libpurple/conversation.h |
| diffstat | 3 files changed, 2 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog.API Mon Jun 20 06:07:46 2011 +0000 +++ b/ChangeLog.API Tue Jun 21 01:40:54 2011 +0000 @@ -3,10 +3,8 @@ version 2.9.0 (MM/DD/YYYY): libpurple: Added: - * Hash table and equivalence function to PurpleConvChat struct, - which makes purple_conv_chat_cb_find O(1). The equivalence - function should only be set by a prpl, and must only be set - before any occupants are in the room. + * Hash table to PurpleConvChat struct, used to make + purple_conv_chat_cb_find O(1). * ui_data opaque pointer to PurpleConvChatBuddy struct. Deprecated:
--- a/libpurple/conversation.c Mon Jun 20 06:07:46 2011 +0000 +++ b/libpurple/conversation.c Tue Jun 21 01:40:54 2011 +0000 @@ -412,8 +412,6 @@ conv->u.chat = g_new0(PurpleConvChat, 1); conv->u.chat->conv = conv; - conv->u.chat->user_hash_func = _purple_conversation_user_hash; - conv->u.chat->user_eq_func = _purple_conversation_user_equal; conv->u.chat->users = g_hash_table_new_full(_purple_conversation_user_hash, _purple_conversation_user_equal, NULL, NULL); PURPLE_DBUS_REGISTER_POINTER(conv->u.chat, PurpleConvChat);
--- a/libpurple/conversation.h Mon Jun 20 06:07:46 2011 +0000 +++ b/libpurple/conversation.h Tue Jun 21 01:40:54 2011 +0000 @@ -284,16 +284,6 @@ GHashTable *users; /**< Hash table of the users in the room. * @since 2.9.0 */ - GHashFunc user_hash_func; /**< Function used to hash entries into - * the users hash. Defaults to a - * case-insensitive collation function. - * @since 2.9.0 - */ - GEqualFunc user_eq_func; /**< Function used for equality in the - * users hash. Defaults to a wrapper - * around purple_utf8_strcasecmp. - * @since 2.9.0 - */ }; /**