# HG changeset patch # User masca@cpw.pidgin.im # Date 1285189790 0 # Node ID b7b2b1f81aa08a62ee02402628c06a12c7e49267 # Parent c0337902d62a6002ea0f806a3ca233f4c0f9576b Normalize both passports before comparation. This fixes the bug that opens a MUC with a buddy that is logged in on mutiple endpoints. diff -r c0337902d62a -r b7b2b1f81aa0 libpurple/protocols/msn/user.c --- a/libpurple/protocols/msn/user.c Wed Sep 22 20:58:43 2010 +0000 +++ b/libpurple/protocols/msn/user.c Wed Sep 22 21:09:50 2010 +0000 @@ -735,11 +735,17 @@ int msn_user_passport_cmp(MsnUser *user, const char *passport) { - const char *pass; + const char *str; + char *pass; + int result; - pass = purple_normalize_nocase(NULL, msn_user_get_passport(user)); + str = purple_normalize_nocase(NULL, msn_user_get_passport(user)); + pass = g_strdup(str); - return strcmp(pass, purple_normalize_nocase(NULL, passport)); + result = g_strcmp0(pass, purple_normalize_nocase(NULL, passport)); + g_free(pass); + + return result; } gboolean