# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1188825810 0
# Node ID e918e38a56b0061d076d12083bc69208f5f57230
# Parent  46fd9b9a667dbfeb1565a619c8c0d7cd5fd4252c
writing-im-msg now receives the conversation name as the who argument if
the caller of purple_conversation_write didn't provide a value for who.

Fixes #2928

diff -r 46fd9b9a667d -r e918e38a56b0 ChangeLog.API
--- a/ChangeLog.API	Mon Sep 03 13:14:04 2007 +0000
+++ b/ChangeLog.API	Mon Sep 03 13:23:30 2007 +0000
@@ -9,15 +9,15 @@
 		* serv_send_attention(), serv_got_attention(), as well as send_attention 
 		  and attention_types in PurplePluginProtocolInfo. This new API is used
 		  for zapping in MySpaceIM, buzzing in Yahoo, and nudging in MSN.
+
 		Changed:
 		* purple_prefs_load is now called within purple_prefs_init.
 		  The UI no longer needs to call it.
+		* writing-im-msg now receives the conversation name as the who
+		  argument if the caller of purple_conversation_write didn't
+		  provide a value for who.
 
 	Pidgin:
-		Changed:
-		* pidgin_conversations_fill_menu now also adds a separator and a 'Show
-		  All' item if there are more than one conversations in the list.
-
 		Added:
 		* pidgin_set_accessible_relations, sets up label-for and labelled-by
 		  ATK relations (broken out from pidgin_set_accessible_label)
@@ -25,6 +25,10 @@
 		  conversation
 		* conversation-hiding and conversation-displayed signals.
 
+		Changed:
+		* pidgin_conversations_fill_menu now also adds a separator and a 'Show
+		  All' item if there are more than one conversations in the list.
+
 	Finch:
 		Added:
 		* finch_sound_is_enabled
diff -r 46fd9b9a667d -r e918e38a56b0 libpurple/conversation.c
--- a/libpurple/conversation.c	Mon Sep 03 13:14:04 2007 +0000
+++ b/libpurple/conversation.c	Mon Sep 03 13:23:30 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)));