im.pidgin.pidgin: bd8310274d1042fdb2ed736b385293ff134ddee0

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: bd8310274d1042fdb2ed736b385293ff134ddee0
Ancestor: 9de3934cd71a8b08f0f6da39df8f0102d36fbd2b
Author: sadrul at pidgin.im
Date: 2008-02-25T15:24:49
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/bd8310274d1042fdb2ed736b385293ff134ddee0

Modified files:
        pidgin/gtkconv.c

ChangeLog: 

This should fix the issue with persistent conversations getting closed all unexpected like.

-------------- next part --------------
============================================================
--- pidgin/gtkconv.c	99510514ab71d30ff225dcd08bbc64e4ad7c31cb
+++ pidgin/gtkconv.c	c9dd80f7d1cc0314cf6fbcceccb1d4a08f8238af
@@ -2806,16 +2806,11 @@ pidgin_conv_present_conversation(PurpleC
 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