Mercurial > pidgin.yaz
changeset 19606:e918e38a56b0
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
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Mon, 03 Sep 2007 13:23:30 +0000 |
| parents | 46fd9b9a667d |
| children | c1ef5a108b91 |
| files | ChangeLog.API libpurple/conversation.c |
| diffstat | 2 files changed, 12 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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)));