# HG changeset patch
# User Mikael Berthe <mikael@lilotux.net>
# Date 1177084958 -7200
# Node ID ef40688d87bd43e685ff6730ebc053b87e79546f
# Parent  16abe7ec305693916b8d75b53487aaad1e2d29be
Add option 'buddy_me_fulljid'
When a contacts sends "/me ", mcabber used to display "*user@server.net ",
which can take a lot of space.  It now displays only "*user ", but the old
behaviour can be kept with the new option.

diff -r 16abe7ec3056 -r ef40688d87bd mcabber/mcabberrc.example
--- a/mcabber/mcabberrc.example	Fri Apr 20 17:14:38 2007 +0200
+++ b/mcabber/mcabberrc.example	Fri Apr 20 18:02:38 2007 +0200
@@ -272,6 +272,12 @@
 # - 3: "name" (if the name is the same as the jid, use <jid/res>)
 #set buddy_format = 2
 #
+# When a contacts sends "/me ", mcabber displays "*user ", where user
+# is the local part of the contact's jid.
+# If you want mcabber to display the complete bare jid (user@server.com),
+# set "buddy_me_fulljid" to 1 (default: 0)
+#set buddy_me_fulljid = 1
+#
 # 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
diff -r 16abe7ec3056 -r ef40688d87bd mcabber/src/hooks.c
--- a/mcabber/src/hooks.c	Fri Apr 20 17:14:38 2007 +0200
+++ b/mcabber/src/hooks.c	Fri Apr 20 18:02:38 2007 +0200
@@ -67,9 +67,16 @@
     }
   } else {
     bmsg = g_strdup(msg);
-    if (!strncmp(msg, COMMAND_ME, strlen(COMMAND_ME)))
-      wmsg = mmsg = g_strdup_printf("*%s %s", bjid, msg+4);
-    else
+    if (!strncmp(msg, COMMAND_ME, strlen(COMMAND_ME))) {
+      gchar *shortid = g_strdup(bjid);
+      if (settings_opt_get_int("buddy_me_fulljid") == FALSE) {
+        gchar *p = strchr(shortid, '@'); // Truncate the jid
+        if (p)
+          *p = '\0';
+      }
+      wmsg = mmsg = g_strdup_printf("*%s %s", shortid, msg+4);
+      g_free(shortid);
+    } else
       wmsg = (char*) msg;
   }