# HG changeset patch
# User Nathan Walp <nwalp@pidgin.im>
# Date 1072858975 0
# Node ID b02b30247e7ac261a89ed9906fe3ca81cea6afc6
# Parent  a5c70e43ee43b135c25d3546b4ff697eae726d2e
[gaim-migrate @ 8642]
oops

committer: Tailor Script <tailor@pidgin.im>

diff -r a5c70e43ee43 -r b02b30247e7a src/protocols/jabber/presence.c
--- a/src/protocols/jabber/presence.c	Wed Dec 31 08:05:22 2003 +0000
+++ b/src/protocols/jabber/presence.c	Wed Dec 31 08:22:55 2003 +0000
@@ -313,7 +313,7 @@
 				jabber_chat_destroy(chat);
 			} else {
 				gaim_conv_chat_remove_user(GAIM_CONV_CHAT(chat->conv), jid->resource,
-						real_jid);
+						NULL);
 			}
 		} else {
 			if(!jabber_chat_find_buddy(chat->conv, jid->resource))
diff -r a5c70e43ee43 -r b02b30247e7a src/protocols/jabber/xdata.c
--- a/src/protocols/jabber/xdata.c	Wed Dec 31 08:05:22 2003 +0000
+++ b/src/protocols/jabber/xdata.c	Wed Dec 31 08:22:55 2003 +0000
@@ -260,7 +260,7 @@
 					data->values = g_slist_prepend(data->values, value);
 
 					gaim_request_field_list_add(field, lbl, value);
-					if(g_list_find_custom(selected, value, g_str_equal))
+					if(g_list_find_custom(selected, value, (GCompareFunc)strcmp))
 						gaim_request_field_list_add_selected(field, lbl);
 				}
 				gaim_request_field_group_add_field(group, field);