# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1180795273 0
# Node ID 70fb7663a918e1e3b54c30955d37fae7ac02a0c6
# Parent  ff04387682ce1df9ca36fa3b79e5ab6b3ff67340# Parent  56c4f462b1105ea23757e2cb1314dc1a2000932a
merge of '2a1a3522e67a5f99ed2e65a23693d148907cfdb7'
     and '92064acfc75ce644d052783c588ecd1058b3a76a'

diff -r 56c4f462b110 -r 70fb7663a918 libpurple/conversation.c
--- a/libpurple/conversation.c	Sat Jun 02 14:25:41 2007 +0000
+++ b/libpurple/conversation.c	Sat Jun 02 14:41:13 2007 +0000
@@ -1961,7 +1961,7 @@
 
 	for (l = purple_conv_chat_get_users(chat); l; l = l->next) {
 		cb = l->data;
-		if (!purple_utf8_strcasecmp(cb->name, name))
+		if (!g_utf8_collate(cb->name, name))
 			return cb;
 	}
 
diff -r 56c4f462b110 -r 70fb7663a918 pidgin/gtkaccount.c
--- a/pidgin/gtkaccount.c	Sat Jun 02 14:25:41 2007 +0000
+++ b/pidgin/gtkaccount.c	Sat Jun 02 14:41:13 2007 +0000
@@ -433,7 +433,9 @@
 
 	/* Screen name */
 	dialog->screenname_entry = gtk_entry_new();
+#if GTK_CHECK_VERSION(2,10,0)
 	g_object_set(G_OBJECT(dialog->screenname_entry), "truncate-multiline", TRUE, NULL);
+#endif
 
 	add_pref_box(dialog, vbox, _("Screen name:"), dialog->screenname_entry);
 
diff -r 56c4f462b110 -r 70fb7663a918 pidgin/gtkutils.c