changeset 19415:2128daf52d31

Reattach the gtk-ui to a conversation when the user wants to reopen the conversation from pidgin.
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Sat, 25 Aug 2007 04:53:45 +0000
parents 3d42c005fc17
children 3489182dc187
files pidgin/gtkblist.c pidgin/gtkdialogs.c
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/gtkblist.c	Sat Aug 25 04:50:57 2007 +0000
+++ b/pidgin/gtkblist.c	Sat Aug 25 04:53:45 2007 +0000
@@ -331,8 +331,10 @@
 	conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT, name,
 											   chat->account);
 
-	if (conv != NULL)
+	if (conv != NULL) {
+		pidgin_conv_attach_to_conversation(conv);
 		purple_conversation_present(conv);
+	}
 
 	serv_join_chat(chat->account->gc, chat->components);
 	g_free(chat_name);
--- a/pidgin/gtkdialogs.c	Sat Aug 25 04:50:57 2007 +0000
+++ b/pidgin/gtkdialogs.c	Sat Aug 25 04:53:45 2007 +0000
@@ -765,6 +765,7 @@
 	if (conv == NULL)
 		conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, username);
 
+	pidgin_conv_attach_to_conversation(conv);
 	purple_conversation_present(conv);
 }