changeset 1109:7e383aa48b3d

Fix a small mistake introduced in changeset 1db3d045e95c When using /room privmsg foo /me thinks the "/me" should be replaced with our nickname, not "foo".
author Mikael Berthe <mikael@lilotux.net>
date Thu, 14 Dec 2006 22:42:01 +0100
parents a0e9eaa9f5b4
children 6db427a14ee8
files mcabber/src/hooks.c
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mcabber/src/hooks.c	Thu Dec 14 22:32:03 2006 +0100
+++ b/mcabber/src/hooks.c	Thu Dec 14 22:42:01 2006 +0100
@@ -179,8 +179,11 @@
 
   if (nick) {
     wmsg = bmsg = g_strdup_printf("PRIV#<%s> %s", nick, msg);
-    if (!strncmp(msg, COMMAND_ME, strlen(COMMAND_ME)))
-      wmsg = mmsg = g_strdup_printf("PRIV#*%s %s", nick, msg+4);
+    if (!strncmp(msg, COMMAND_ME, strlen(COMMAND_ME))) {
+      const char *mynick = roster_getnickname(bjid);
+      wmsg = mmsg = g_strdup_printf("PRIV#<%s> *%s %s", nick,
+                                    (mynick ? mynick : "me"), msg+4);
+    }
   } else {
     wmsg = (char*)msg;
     if (!strncmp(msg, COMMAND_ME, strlen(COMMAND_ME))) {