diff src/server.c @ 12288:3897229ccb33

[gaim-migrate @ 14592] " This patch fixes two serious bugs in the hidden conversation/queuing code. First, it removes the need to explicitly present conversations created under queuing conditions. Instead, when an incoming message is received and a conversation does not exist, a hidden conversation is created in a received-im-msg signal handler by swapping out the create_conversation function in the gtkconv ui_ops. This fixes a bug which could allow conversations to be created in a hidden state when they should be visible (i.e. buddy pounce open an im window action). This required a second search for a conversation in server.c after the signal is emitted. Second, it fixes a bug which would cause gaim to crash when quitting with a queued message. Fixing this simplified the code a bit by removing the private_remove_gtkconv function and instead adding a check in gaim_gtk_conv_window_remove_gtkconv to prevent the hidden_convwin from being destroyed when the last conversation is removed." --charkins committer: Tailor Script <[e-mail]>

--- a/src/server.c	Thu Dec 01 21:22:55 2005 +0000
+++ b/src/server.c	Fri Dec 02 00:40:32 2005 +0000
@@ -476,6 +476,10 @@
 	gaim_signal_emit(gaim_conversations_get_handle(), "received-im-msg", gc->account,
 					 name, message, cnv, flags);
 
+	/* search for conversation again in case it was created by received-im-msg handler */
+	if (cnv == NULL)
+		cnv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, name, gc->account);
+
 	/* Make sure URLs are clickable */
 	buffy = gaim_markup_linkify(message);
 	g_free(message);