pidgin/pidgin

Switch sending-chat-msg to PurpleMessage

2014-05-22, Tomasz Wasilczyk
637a1a87c4d3
Parents 2e449140fe0b
Children 6764e037a308
Switch sending-chat-msg to PurpleMessage
4 files changed, 10 insertions(+), 11 deletions(-)
  • +2 -3
    libpurple/conversation.c
  • +2 -4
    libpurple/conversations.c
  • +3 -2
    libpurple/plugins/signals-test.c
  • +3 -2
    libpurple/protocols/irc/cmds.c
    • --- a/libpurple/conversation.c Thu May 22 16:38:42 2014 +0200
    +++ b/libpurple/conversation.c Thu May 22 16:42:04 2014 +0200
    @@ -158,9 +158,8 @@
    msg = purple_message_new(NULL, sent, msgflags);
    - /* TODO: use msg! */
    - purple_signal_emit(purple_conversations_get_handle(), "sending-chat-msg",
    - account, &sent, id);
    + purple_signal_emit(purple_conversations_get_handle(),
    + "sending-chat-msg", account, msg, id);
    if (!purple_message_is_empty(msg)) {
    err = purple_serv_chat_send(gc, id, msg);
    --- a/libpurple/conversations.c Thu May 22 16:38:42 2014 +0200
    +++ b/libpurple/conversations.c Thu May 22 16:42:04 2014 +0200
    @@ -343,10 +343,8 @@
    G_TYPE_STRING, PURPLE_TYPE_CHAT_CONVERSATION, G_TYPE_UINT);
    purple_signal_register(handle, "sending-chat-msg",
    - purple_marshal_VOID__POINTER_POINTER_UINT, G_TYPE_NONE,
    - 3, PURPLE_TYPE_ACCOUNT,
    - G_TYPE_POINTER, /* pointer to a string */
    - G_TYPE_UINT);
    + purple_marshal_VOID__POINTER_POINTER_UINT, G_TYPE_NONE,
    + 3, PURPLE_TYPE_ACCOUNT, PURPLE_TYPE_MESSAGE, G_TYPE_UINT);
    purple_signal_register(handle, "sent-chat-msg",
    purple_marshal_VOID__POINTER_POINTER_UINT, G_TYPE_NONE,
    --- a/libpurple/plugins/signals-test.c Thu May 22 16:38:42 2014 +0200
    +++ b/libpurple/plugins/signals-test.c Thu May 22 16:42:04 2014 +0200
    @@ -356,10 +356,11 @@
    }
    static gboolean
    -sending_chat_msg_cb(PurpleAccount *account, char **buffer, int id, void *data)
    +sending_chat_msg_cb(PurpleAccount *account, PurpleMessage *msg, int id, void *data)
    {
    purple_debug_misc("signals test", "sending-chat-msg (%s, %s, %d)\n",
    - purple_account_get_username(account), *buffer, id);
    + purple_account_get_username(account),
    + purple_message_get_contents(msg), id);
    return FALSE;
    }
    --- a/libpurple/protocols/irc/cmds.c Thu May 22 16:38:42 2014 +0200
    +++ b/libpurple/protocols/irc/cmds.c Thu May 22 16:42:04 2014 +0200
    @@ -114,9 +114,10 @@
    purple_signal_emit(purple_conversations_get_handle(),
    "sending-im-msg", irc->account, pmsg);
    } else {
    - /* TODO: pmsg! */
    + pmsg = purple_message_new(NULL, msg, PURPLE_MESSAGE_SEND);
    +
    purple_signal_emit(purple_conversations_get_handle(),
    - "sending-chat-msg", irc->account, &msg,
    + "sending-chat-msg", irc->account, pmsg,
    purple_chat_conversation_get_id(PURPLE_CHAT_CONVERSATION(convo)));
    }