Mercurial > pidgin
changeset 17998:70fb7663a918
merge of '2a1a3522e67a5f99ed2e65a23693d148907cfdb7'
and '92064acfc75ce644d052783c588ecd1058b3a76a'
author | Sadrul Habib Chowdhury <imadil@gmail.com> |
---|---|
date | Sat, 02 Jun 2007 14:41:13 +0000 |
parents | ff04387682ce (diff) 56c4f462b110 (current diff) |
children | fc2bb1b42868 |
files | libpurple/conversation.c pidgin/gtkaccount.c pidgin/gtkutils.c |
diffstat | 2 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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; }
--- 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);