Mercurial > pidgin.yaz
comparison libpurple/protocols/msn/switchboard.c @ 31315:23be655cc688
propagate from branch 'im.pidgin.cpw.qulogic.msnp16' (head a27b68b2e6653e6b96aa0279bd649181c89b20ed)
to branch 'im.pidgin.soc.2010.msn-tlc' (head 20ad1c813e2b512df4a065dda88f3cfa732463a3)
| author | masca@cpw.pidgin.im |
|---|---|
| date | Wed, 15 Sep 2010 17:34:21 +0000 |
| parents | 47b6eda87723 6469c68fa093 |
| children | e977b0d766a7 |
comparison
equal
deleted
inserted
replaced
| 31311:4b1eecab50e8 | 31315:23be655cc688 |
|---|---|
| 253 userlist = swboard->session->userlist; | 253 userlist = swboard->session->userlist; |
| 254 msnuser = msn_userlist_find_user(userlist, passport); | 254 msnuser = msn_userlist_find_user(userlist, passport); |
| 255 | 255 |
| 256 /* Don't add multiple endpoints to the conversation. */ | 256 /* Don't add multiple endpoints to the conversation. */ |
| 257 if (g_list_find_custom(swboard->users, passport, (GCompareFunc)msn_user_passport_cmp)) { | 257 if (g_list_find_custom(swboard->users, passport, (GCompareFunc)msn_user_passport_cmp)) { |
| 258 g_free(passport); | |
| 259 return; | |
| 260 } | |
| 261 | |
| 262 /* Don't add ourselves either... */ | |
| 263 if (g_str_equal(passport, purple_account_get_username(account))) { | |
| 258 g_free(passport); | 264 g_free(passport); |
| 259 return; | 265 return; |
| 260 } | 266 } |
| 261 | 267 |
| 262 /* Don't add ourselves either... */ | 268 /* Don't add ourselves either... */ |