# HG changeset patch
# User Mikael Berthe <mikael@lilotux.net>
# Date 1145042348 -7200
# Node ID 4a6ce276ffca9d862289d73ccdb1f36da17ffab8
# Parent  f6cda389db48caf3955dd0e187e2bfceaff41131
New option "log_display_sender"


diff -r f6cda389db48 -r 4a6ce276ffca mcabber/mcabberrc.example
--- a/mcabber/mcabberrc.example	Fri Apr 14 20:43:11 2006 +0200
+++ b/mcabber/mcabberrc.example	Fri Apr 14 21:19:08 2006 +0200
@@ -184,6 +184,10 @@
 # Display the status changes in the chat buffers (default: 0, never)
 # Values:  0: never  1: only connect/disconnect  2: all
 #set show_status_in_buffer = 1
+#
+# Set "log_display_sender" to 1 to display the message sender's jid in the
+# log window (default: 0, no)
+#set log_display_sender = 0
 
 # Aliases
 alias me = say /me
diff -r f6cda389db48 -r 4a6ce276ffca mcabber/src/hooks.c
--- a/mcabber/src/hooks.c	Fri Apr 14 20:43:11 2006 +0200
+++ b/mcabber/src/hooks.c	Fri Apr 14 21:19:08 2006 +0200
@@ -133,6 +133,15 @@
   if ((is_groupchat && !timestamp) || !is_groupchat)
     hk_ext_cmd(jid, (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(jid);
+    if (!name) name = "";
+    scr_LogPrint(LPRINT_NORMAL, "Message received from %s <%s/%s>",
+                 name, jid, resname);
+  }
+
   // Beep, if enabled
   if (settings_opt_get_int("beep_on_message"))
     scr_Beep();