Mercurial > pidgin.yaz
comparison libpurple/conversation.c @ 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 | ea26d30449fd |
children | 44b4e8bd759b |
comparison
equal
deleted
inserted
replaced
19605:46fd9b9a667d | 19606:e918e38a56b0 |
---|---|
867 !g_list_find(purple_get_conversations(), conv)) | 867 !g_list_find(purple_get_conversations(), conv)) |
868 return; | 868 return; |
869 | 869 |
870 displayed = g_strdup(message); | 870 displayed = g_strdup(message); |
871 | 871 |
872 if (who == NULL || *who == '\0') | |
873 who = purple_conversation_get_name(conv); | |
874 alias = who; | |
875 | |
872 plugin_return = | 876 plugin_return = |
873 GPOINTER_TO_INT(purple_signal_emit_return_1( | 877 GPOINTER_TO_INT(purple_signal_emit_return_1( |
874 purple_conversations_get_handle(), | 878 purple_conversations_get_handle(), |
875 (type == PURPLE_CONV_TYPE_IM ? "writing-im-msg" : "writing-chat-msg"), | 879 (type == PURPLE_CONV_TYPE_IM ? "writing-im-msg" : "writing-chat-msg"), |
876 account, who, &displayed, conv, flags)); | 880 account, who, &displayed, conv, flags)); |
880 | 884 |
881 if (plugin_return) { | 885 if (plugin_return) { |
882 g_free(displayed); | 886 g_free(displayed); |
883 return; | 887 return; |
884 } | 888 } |
885 | |
886 if (who == NULL || *who == '\0') | |
887 who = purple_conversation_get_name(conv); | |
888 | |
889 alias = who; | |
890 | 889 |
891 if (account != NULL) { | 890 if (account != NULL) { |
892 prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(purple_find_prpl(purple_account_get_protocol_id(account))); | 891 prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(purple_find_prpl(purple_account_get_protocol_id(account))); |
893 | 892 |
894 if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM || | 893 if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM || |