pidgin: 276af715: Fix the conversation window closing unex...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 276af715e3b26cba28965e1fa14e8c6e5ac65a85
Ancestor: 4e2880e0b1b33a1395280db14803f92cc93843de
Author: sadrul at pidgin.im
Date: 2008-09-05T12:07:37
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/276af715e3b26cba28965e1fa14e8c6e5ac65a85

Modified files:
        pidgin/gtkconv.c

ChangeLog: 

Fix the conversation window closing unexpectedly. Again.

Fixes #4442.

-------------- next part --------------
============================================================
--- pidgin/gtkconv.c	ad33c07b949b538914c790f5ef88ce1b8a6e3c69
+++ pidgin/gtkconv.c	d5d1af9143decabb9f3f68f68b0bbc788cc5516e
@@ -5253,8 +5253,7 @@ received_im_msg_cb(PurpleAccount *accoun
 	if (conv && PIDGIN_IS_PIDGIN_CONVERSATION(conv) && !hide) {
 		PidginConversation *gtkconv = PIDGIN_CONVERSATION(conv);
 		if (gtkconv->win == hidden_convwin) {
-			pidgin_conv_window_remove_gtkconv(gtkconv->win, gtkconv);
-			pidgin_conv_placement_place(gtkconv);
+			pidgin_conv_attach_to_conversation(gtkconv->active_conv);
 		}
 		return;
 	}
@@ -7239,8 +7238,7 @@ account_status_changed_cb(PurpleAccount 
 		if (!l)
 			break;
 
-		pidgin_conv_window_remove_gtkconv(hidden_convwin, gtkconv);
-		pidgin_conv_placement_place(gtkconv);
+		pidgin_conv_attach_to_conversation(conv);
 
 		/* TODO: do we need to do anything for any other conversations that are in the same gtkconv here?
 		 * I'm a little concerned that not doing so will cause the "pending" indicator in the gtkblist not to be cleared. -DAA*/
@@ -7280,8 +7278,7 @@ hide_new_pref_cb(const char *name, Purpl
 							purple_conversation_get_account(conv)))))
 			continue;
 
-		pidgin_conv_window_remove_gtkconv(hidden_convwin, gtkconv);
-		pidgin_conv_placement_place(gtkconv);
+		pidgin_conv_attach_to_conversation(conv);
 	}
 }