pidgin.next.minor: f2ccf045: conversation: Strip off the exposed func...

[darkrain42 at pidgin.im]

----------------------------------------------------------------------
Revision: f2ccf0453c27ba6cf57bcf9e0477a961b389f054
Parent:   be8cdf3875ebf5da54bda7836bcb5d070c532453
Author:   darkrain42 at pidgin.im
Date:     06/20/11 21:40:54
Branch:   im.pidgin.pidgin.next.minor
URL: http://d.pidgin.im/viewmtn/revision/info/f2ccf0453c27ba6cf57bcf9e0477a961b389f054

Changelog: 

conversation: Strip off the exposed function pointers.

Getting that into a useful form would take a bit more planning
than I was hoping.

Changes against parent be8cdf3875ebf5da54bda7836bcb5d070c532453

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

-------------- next part --------------
============================================================
--- libpurple/conversation.c	9ee548f6040abb5ae9b23fa821067990f2efee3f
+++ libpurple/conversation.c	a13c8d8cbb7916b7ff5a0236ccac696746bb4ce3
@@ -412,8 +412,6 @@ purple_conversation_new(PurpleConversati
 
 		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);
============================================================
--- libpurple/conversation.h	4fc61f2537f22c89cb7420fa8224e638eeb3864e
+++ libpurple/conversation.h	ee3ba57ce65309287c60fa7d3f0d504418cfe2e7
@@ -284,16 +284,6 @@ struct _PurpleConvChat
 	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
-	                                  */
 };
 
 /**
============================================================
--- ChangeLog.API	b664bc9be9035c5e4378f63bc4c0b3bc643d3ab8
+++ ChangeLog.API	04300204f2516924d7cfd9e165b37153c4d67834
@@ -3,10 +3,8 @@ version 2.9.0 (MM/DD/YYYY):
 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: