Mercurial > pidgin
comparison src/protocols/silc/ops.c @ 11500:9fc7d0153332
[gaim-migrate @ 13745]
Remove the stupid prpl option I added with the aliasing code. This fixes the remaining bug I'm aware of. It should be correct, but let me know if I've broken something (which would mostly likely be with Jabber).
committer: Tailor Script <tailor@pidgin.im>
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Sun, 11 Sep 2005 02:58:03 +0000 |
parents | 9c7ca8a8c4b8 |
children | a26eb48d1953 |
comparison
equal
deleted
inserted
replaced
11499:6f9fc83ee25c | 11500:9fc7d0153332 |
---|---|
1212 convo = gaim_find_conversation_with_account(GAIM_CONV_TYPE_CHAT, | 1212 convo = gaim_find_conversation_with_account(GAIM_CONV_TYPE_CHAT, |
1213 chu->channel->channel_name, sg->account); | 1213 chu->channel->channel_name, sg->account); |
1214 if (!convo) | 1214 if (!convo) |
1215 continue; | 1215 continue; |
1216 oldnick = gaim_conv_chat_get_nick(GAIM_CONV_CHAT(convo)); | 1216 oldnick = gaim_conv_chat_get_nick(GAIM_CONV_CHAT(convo)); |
1217 if (strcmp(oldnick, local_entry->nickname)) { | 1217 if (strcmp(oldnick, gaim_normalize(gaim_conversation_get_account(convo), local_entry->nickname))) { |
1218 gaim_conv_chat_rename_user(GAIM_CONV_CHAT(convo), | 1218 gaim_conv_chat_rename_user(GAIM_CONV_CHAT(convo), |
1219 oldnick, local_entry->nickname); | 1219 oldnick, local_entry->nickname); |
1220 gaim_conv_chat_set_nick(GAIM_CONV_CHAT(convo), local_entry->nickname); | 1220 gaim_conv_chat_set_nick(GAIM_CONV_CHAT(convo), local_entry->nickname); |
1221 } | 1221 } |
1222 } | 1222 } |