Mercurial > pidgin
diff libpurple/conversation.c @ 19618:a38ee5d9eedf
merge of 'bf68a58b8bbc1d43f4ebe7b94bd47282cb66f26e'
and 'daa5fcdfa800915c5bed0df9809e1b367f6b56da'
| author | Ka-Hing Cheung <khc@hxbc.us> |
|---|---|
| date | Mon, 03 Sep 2007 21:04:02 +0000 |
| parents | e918e38a56b0 |
| children | 44b4e8bd759b |
line wrap: on
line diff
--- a/libpurple/conversation.c Mon Sep 03 21:02:52 2007 +0000 +++ b/libpurple/conversation.c Mon Sep 03 21:04:02 2007 +0000 @@ -869,6 +869,10 @@ displayed = g_strdup(message); + if (who == NULL || *who == '\0') + who = purple_conversation_get_name(conv); + alias = who; + plugin_return = GPOINTER_TO_INT(purple_signal_emit_return_1( purple_conversations_get_handle(), @@ -883,11 +887,6 @@ return; } - if (who == NULL || *who == '\0') - who = purple_conversation_get_name(conv); - - alias = who; - if (account != NULL) { prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(purple_find_prpl(purple_account_get_protocol_id(account)));