[Gaim-commits] SF.net SVN: gaim: [17927] trunk

[<the...@us...>]

Revision: 17927
          http://svn.sourceforge.net/gaim/?rev=17927&view=rev
Author:   thekingant
Date:     2006-12-09 12:11:43 -0800 (Sat, 09 Dec 2006)

Log Message:
-----------
Stephen Pope in #gaim found a bug in our perl stuff where we were
creating some hash tables that used g_direct_hash instead of
g_str_hash

Modified Paths:
--------------
    trunk/COPYRIGHT
    trunk/libgaim/blist.h
    trunk/libgaim/plugins/perl/common/BuddyList.xs
    trunk/libgaim/plugins/perl/common/Server.xs
    trunk/libgaim/server.h

Modified: trunk/COPYRIGHT
===================================================================
--- trunk/COPYRIGHT	2006-12-09 07:39:29 UTC (rev 17926)
+++ trunk/COPYRIGHT	2006-12-09 20:11:43 UTC (rev 17927)
@@ -241,6 +241,7 @@
 Julien Pivotto
 Ari Pollak
 Robey Pointer
+Stephen Pope
 Nathan Poznick
 Jory A. Pratt
 Brent Priddy

Modified: trunk/libgaim/blist.h
===================================================================
--- trunk/libgaim/blist.h	2006-12-09 07:39:29 UTC (rev 17926)
+++ trunk/libgaim/blist.h	2006-12-09 20:11:43 UTC (rev 17927)
@@ -314,7 +314,9 @@
  *
  * @param account    The account this chat will get added to
  * @param alias      The alias of the new chat
- * @param components The info the prpl needs to join the chat
+ * @param components The info the prpl needs to join the chat.  The
+ *                   hash function should be g_str_hash() and the
+ *                   equal function should be g_str_equal().
  * @return           A newly allocated chat
  */
 GaimChat *gaim_chat_new(GaimAccount *account, const char *alias, GHashTable *components);

Modified: trunk/libgaim/plugins/perl/common/BuddyList.xs
===================================================================
--- trunk/libgaim/plugins/perl/common/BuddyList.xs	2006-12-09 07:39:29 UTC (rev 17926)
+++ trunk/libgaim/plugins/perl/common/BuddyList.xs	2006-12-09 20:11:43 UTC (rev 17927)
@@ -310,7 +310,7 @@
 	char *t_key, *t_value;
 CODE:
 	t_HV =  (HV *)SvRV(components);
-	t_GHash = g_hash_table_new(NULL, NULL);
+	t_GHash = g_hash_table_new(g_str_hash, g_str_equal);
 
 	for (t_HE = hv_iternext(t_HV); t_HE != NULL; t_HE = hv_iternext(t_HV) ) {
 		t_key = hv_iterkey(t_HE, &len);

Modified: trunk/libgaim/plugins/perl/common/Server.xs
===================================================================
--- trunk/libgaim/plugins/perl/common/Server.xs	2006-12-09 07:39:29 UTC (rev 17926)
+++ trunk/libgaim/plugins/perl/common/Server.xs	2006-12-09 20:11:43 UTC (rev 17927)
@@ -80,7 +80,7 @@
 	char *t_key, *t_value;
 CODE:
 	t_HV =  (HV *)SvRV(components);
-	t_GHash = g_hash_table_new(NULL, NULL);
+	t_GHash = g_hash_table_new(g_str_hash, g_str_equal);
 
 	for (t_HE = hv_iternext(t_HV); t_HE != NULL; t_HE = hv_iternext(t_HV) ) {
 		t_key = hv_iterkey(t_HE, &len);
@@ -135,7 +135,7 @@
 	char *t_key, *t_value;
 CODE:
 	t_HV =  (HV *)SvRV(components);
-	t_GHash = g_hash_table_new(NULL, NULL);
+	t_GHash = g_hash_table_new(g_str_hash, g_str_equal);
 
 	for (t_HE = hv_iternext(t_HV); t_HE != NULL; t_HE = hv_iternext(t_HV) ) {
 		t_key = hv_iterkey(t_HE, &len);
@@ -165,7 +165,7 @@
 	char *t_key, *t_value;
 CODE:
 	t_HV =  (HV *)SvRV(components);
-	t_GHash = g_hash_table_new(NULL, NULL);
+	t_GHash = g_hash_table_new(g_str_hash, g_str_equal);
 
 	for (t_HE = hv_iternext(t_HV); t_HE != NULL; t_HE = hv_iternext(t_HV) ) {
 		t_key = hv_iterkey(t_HE, &len);

Modified: trunk/libgaim/server.h
===================================================================
--- trunk/libgaim/server.h	2006-12-09 07:39:29 UTC (rev 17926)
+++ trunk/libgaim/server.h	2006-12-09 20:11:43 UTC (rev 17927)
@@ -59,8 +59,6 @@
 void serv_rem_permit(GaimConnection *, const char *);
 void serv_rem_deny(GaimConnection *, const char *);
 void serv_set_permit_deny(GaimConnection *);
-void serv_join_chat(GaimConnection *, GHashTable *);
-void serv_reject_chat(GaimConnection *, GHashTable *);
 void serv_chat_invite(GaimConnection *, int, const char *, const char *);
 void serv_chat_leave(GaimConnection *, int);
 void serv_chat_whisper(GaimConnection *, int, const char *, const char *);
@@ -91,9 +89,27 @@
 
 void serv_got_im(GaimConnection *gc, const char *who, const char *msg,
 				 GaimMessageFlags flags, time_t mtime);
+
+/**
+ * @param data The hash function should be g_str_hash() and the equal
+ *             function should be g_str_equal().
+ */
+void serv_join_chat(GaimConnection *, GHashTable *);
+
+/**
+ * @param data The hash function should be g_str_hash() and the equal
+ *             function should be g_str_equal().
+ */
+void serv_reject_chat(GaimConnection *, GHashTable *);
+
+/**
+ * @param data The hash function should be g_str_hash() and the equal
+ *             function should be g_str_equal().
+ */
 void serv_got_chat_invite(GaimConnection *gc, const char *name,
 						  const char *who, const char *message,
 						  GHashTable *data);
+
 GaimConversation *serv_got_joined_chat(GaimConnection *gc,
 									   int id, const char *name);
 void serv_got_chat_left(GaimConnection *g, int id);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.