Mercurial > hg
changeset 1847:2e133fc0e3d9
Display the sender in the log window before processing hooks
When 'log_display_sender' is set, display the sender before runnin the
hook-post-message-in hooks.
author | Mikael Berthe <mikael@lilotux.net> |
---|---|
date | Sun, 28 Mar 2010 23:40:10 +0200 |
parents | 048bcde98fc6 |
children | f6e137fe9d6d |
files | mcabber/mcabber/hooks.c |
diffstat | 1 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/mcabber/mcabber/hooks.c Sun Mar 28 19:28:21 2010 +0200 +++ b/mcabber/mcabber/hooks.c Sun Mar 28 23:40:10 2010 +0200 @@ -372,6 +372,15 @@ if (settings_opt_get_int("eventcmd_use_nickname")) ename = roster_getname(bjid); + // Display the sender in the log window + if ((!is_groupchat) && !(message_flags & HBB_PREFIX_ERR) && + settings_opt_get_int("log_display_sender")) { + const char *name = roster_getname(bjid); + if (!name) name = ""; + scr_LogPrint(LPRINT_NORMAL, "Message received from %s <%s/%s>", + name, bjid, (resname ? resname : "")); + } + #ifdef MODULES_ENABLE { hk_arg_t args[] = { @@ -393,15 +402,6 @@ if (!active_window && ((is_groupchat && !timestamp) || !is_groupchat)) hk_ext_cmd(ename ? ename : bjid, (is_groupchat ? 'G' : 'M'), 'R', wmsg); - // Display the sender in the log window - if ((!is_groupchat) && !(message_flags & HBB_PREFIX_ERR) && - settings_opt_get_int("log_display_sender")) { - const char *name = roster_getname(bjid); - if (!name) name = ""; - scr_LogPrint(LPRINT_NORMAL, "Message received from %s <%s/%s>", - name, bjid, (resname ? resname : "")); - } - // Beep, if enabled: // - if it's a private message // - if it's a public message and it's highlighted