# HG changeset patch # User Richard Laager # Date 1130331836 0 # Node ID 908ff9b56e99c664200eca95869e27676796cc91 # Parent 9beb663a6fb533f924a556cdb79f607caef951c8 [gaim-migrate @ 14137] SF Patch #1338349 from sadrul 'From the kwiki (GenericBugs) "If non-buddy B is in a chat with your account A, and you add them as a buddy to account C, they appear in the chat as if they were a buddy of account A until you re-enter the chat."' committer: Tailor Script diff -r 9beb663a6fb5 -r 908ff9b56e99 src/gtkconv.c --- a/src/gtkconv.c Wed Oct 26 12:32:14 2005 +0000 +++ b/src/gtkconv.c Wed Oct 26 13:03:56 2005 +0000 @@ -3280,6 +3280,10 @@ g_return_if_fail(buddy != NULL); g_return_if_fail(conv != NULL); + /* Do nothing if the buddy does not belong to the conv's account */ + if (gaim_buddy_get_account(buddy) != gaim_conversation_get_account(conv)) + return; + /* This is safe because this callback is only used in chats, not IMs. */ model = gtk_tree_view_get_model(GTK_TREE_VIEW(GAIM_GTK_CONVERSATION(conv)->u.chat->list));