Mercurial > pidgin.yaz
diff src/server.c @ 10104:60db14d54914
[gaim-migrate @ 11131]
"This patch that makes received-im-msg and
received-chat-msg signals correspond with each other.
My motivation was to add flags to received-chat-msg,
but I also added conv to received-im-msg to make the
signals match each other."
-- Nathan Fredrickson (noif)
I also updated the receiving-im-msg and receiving-chat-msg signals to match.
Now I can finally reject patch 909745 with "this should be a plugin", which
I've wanted to be able to say for a while. Yay :)
committer: Tailor Script <tailor@pidgin.im>
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Sat, 16 Oct 2004 15:07:22 +0000 |
| parents | eaec201b2688 |
| children | 9f358a718f38 |
line wrap: on
line diff
--- a/src/server.c Sat Oct 16 01:05:40 2004 +0000 +++ b/src/server.c Sat Oct 16 15:07:22 2004 +0000 @@ -807,7 +807,7 @@ plugin_return = GPOINTER_TO_INT( gaim_signal_emit_return_1(gaim_conversations_get_handle(), "receiving-im-msg", gc->account, - &angel, &buffy, &imflags)); + &angel, &buffy, cnv, &imflags)); if (!buffy || !angel || plugin_return) { if (buffy) @@ -821,7 +821,7 @@ message = buffy; gaim_signal_emit(gaim_conversations_get_handle(), "received-im-msg", gc->account, - name, message, imflags); + name, message, cnv, imflags); /* Make sure URLs are clickable */ buffy = gaim_markup_linkify(message); @@ -1277,7 +1277,7 @@ plugin_return = GPOINTER_TO_INT( gaim_signal_emit_return_1(gaim_conversations_get_handle(), "receiving-chat-msg", g->account, - &angel, &buffy, conv)); + &angel, &buffy, conv, &chatflags)); if (!buffy || !angel || plugin_return) { if (buffy) @@ -1290,7 +1290,7 @@ message = buffy; gaim_signal_emit(gaim_conversations_get_handle(), "received-chat-msg", g->account, - who, message, conv); + who, message, conv, chatflags); /* Make sure URLs are clickable */ buf = gaim_markup_linkify(message); @@ -1299,6 +1299,8 @@ msgflags |= GAIM_MESSAGE_WHISPER; if (chatflags & GAIM_CONV_CHAT_DELAYED) msgflags |= GAIM_MESSAGE_DELAYED; + if (chatflags & GAIM_CONV_CHAT_ALERT) + msgflags |= GAIM_MESSAGE_NICK; gaim_conv_chat_write(chat, who, buf, msgflags, mtime);