changeset 22326:63f102c210ad

This should fix the issue with persistent conversations getting closed all unexpected like.
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Mon, 25 Feb 2008 15:24:49 +0000
parents 9d02eb04f406
children dc47e908965f 89a036334991
files pidgin/gtkconv.c
diffstat 1 files changed, 3 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/gtkconv.c	Mon Feb 25 00:25:51 2008 +0000
+++ b/pidgin/gtkconv.c	Mon Feb 25 15:24:49 2008 +0000
@@ -2806,16 +2806,11 @@
 void
 pidgin_conv_present_conversation(PurpleConversation *conv)
 {
-	PidginConversation *gtkconv = PIDGIN_CONVERSATION(conv);
+	PidginConversation *gtkconv;
 	GdkModifierType state;
 
-	if (gtkconv == NULL) {
-		pidgin_conv_attach_to_conversation(conv);
-		gtkconv = PIDGIN_CONVERSATION(conv);
-	} else if (gtkconv->win == hidden_convwin) {
-		pidgin_conv_window_remove_gtkconv(hidden_convwin, gtkconv);
-		pidgin_conv_placement_place(gtkconv);
-	}
+	pidgin_conv_attach_to_conversation(conv);
+	gtkconv = PIDGIN_CONVERSATION(conv);
 
 	pidgin_conv_switch_active_conversation(conv);
 	/* Switch the tab only if the user initiated the event by pressing