Mercurial > pidgin.yaz
comparison libpurple/protocols/jabber/buddy.c @ 26788:fbb2b8e2d91e
Use purple_strequal and g_str_equal
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sun, 26 Apr 2009 23:24:45 +0000 |
parents | fef989505ea2 |
children | 80437c891f92 |
comparison
equal
deleted
inserted
replaced
26787:fef989505ea2 | 26788:fbb2b8e2d91e |
---|---|
1102 g_free(data); | 1102 g_free(data); |
1103 } | 1103 } |
1104 } | 1104 } |
1105 | 1105 |
1106 /* Republish our vcard if the photo is different than the server's */ | 1106 /* Republish our vcard if the photo is different than the server's */ |
1107 if ((!vcard_hash && js->initial_avatar_hash) || | 1107 if (!purple_strequal(vcard_hash, js->initial_avatar_hash)) { |
1108 (vcard_hash && (!js->initial_avatar_hash || strcmp(vcard_hash, js->initial_avatar_hash)))) { | |
1109 PurpleAccount *account = purple_connection_get_account(js->gc); | 1108 PurpleAccount *account = purple_connection_get_account(js->gc); |
1110 jabber_set_info(js->gc, purple_account_get_user_info(account)); | 1109 jabber_set_info(js->gc, purple_account_get_user_info(account)); |
1111 } else if (js->initial_avatar_hash) { | 1110 } else if (js->initial_avatar_hash) { |
1112 /* Our photo is in the vcard, so advertise vcard-temp updates */ | 1111 /* Our photo is in the vcard, so advertise vcard-temp updates */ |
1113 js->avatar_hash = g_strdup(js->initial_avatar_hash); | 1112 js->avatar_hash = g_strdup(js->initial_avatar_hash); |