comparison 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 <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Fri, 02 Dec 2005 00:40:32 +0000
parents 970fec1d7062
children 4c7e5eb7c09d
comparison
equal deleted inserted replaced
12287:e4a9be312854 12288:3897229ccb33
474 message = buffy; 474 message = buffy;
475 475
476 gaim_signal_emit(gaim_conversations_get_handle(), "received-im-msg", gc->account, 476 gaim_signal_emit(gaim_conversations_get_handle(), "received-im-msg", gc->account,
477 name, message, cnv, flags); 477 name, message, cnv, flags);
478 478
479 /* search for conversation again in case it was created by received-im-msg handler */
480 if (cnv == NULL)
481 cnv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, name, gc->account);
482
479 /* Make sure URLs are clickable */ 483 /* Make sure URLs are clickable */
480 buffy = gaim_markup_linkify(message); 484 buffy = gaim_markup_linkify(message);
481 g_free(message); 485 g_free(message);
482 message = buffy; 486 message = buffy;
483 487