updates

diff --git a/CHANGES b/CHANGES
index 9d6259dec5bcdec776155334c9e682002be72394..5c7807ad0fec61d4b2a37f529ebc9efea4266589 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,9 @@ Tue Jun  5 08:08:21 CEST 2001  Pekka Riikonen <priikone@poseidon.pspt.fi>
        * Merged a splitted window bug from Irssi CVS tree.  The affected
          file is irssi/src/fe-text/textbuffer-view.c.
 
+       * Fixed the ME, ACTION and NOTICE printing in Irssi Client.
+         It did not print nickname.
+
 Mon Jun  4 17:57:16 CEST 2001  Pekka Riikonen <priikone@poseidon.pspt.fi>
 
        * Merged /WINDOW bugfix from irssi CVS tree. Affected file is

diff --git a/apps/irssi/default.theme b/apps/irssi/default.theme
index 321f3bb5e9164c1de9521180856c6a3b83da0016..4e1ec830900776a875a5d5c96189603978f50a88 100644 (file)
--- a/apps/irssi/default.theme
+++ b/apps/irssi/default.theme
@@ -119,20 +119,20 @@ abstracts = {
   ##
 
   # Generic action
-  action = "%Y* $0-";
+  action = "%Y* $0 $1-";
 
   # Own sent action
-  ownaction = "%c* $0-";
+  ownaction = "%c* $0 $1-";
 
   ##
   ## Notice (/NOTICE command)
   ##
 
   # Generic notice
-  notice = "%C- $0-";
+  notice = "%C- $0 $1-";
 
   # Own sent notice
-  ownnotice = "%g- $0";
+  ownnotice = "%g- $0 $1-";
 
 
   ##

diff --git a/apps/irssi/src/fe-common/silc/module-formats.c b/apps/irssi/src/fe-common/silc/module-formats.c
index 70535e9286c4a3dbe7e4144206f800901147b009..cbdead77edc507382bc05d2080ed197d3ade1484 100644 (file)
--- a/apps/irssi/src/fe-common/silc/module-formats.c
+++ b/apps/irssi/src/fe-common/silc/module-formats.c
@@ -33,10 +33,10 @@ FORMAT_REC fecommon_silc_formats[] = {
        { "channel_topic", "Topic for {channel $0} is: $1", 2, { 0, 0 } },
        { "cmode", "channel mode/{channel $0} {mode $1} by {nick $2}", 3, { 0, 0, 0 } },
        { "cumode", "channel user mode/{channel $0}/{nick $1} {mode $2} by {nick $3}", 4, { 0, 0, 0, 0 } },
-       { "action", "{action $0}", 1, { 0 } },
-       { "notice", "{notice $0}", 1, { 0 } },
-       { "ownaction", "{ownaction $0}", 1, { 0 } },
-       { "ownnotice", "{ownnotice $0}", 1, { 0 } },
+       { "action", "{action $0-}", 2, { 0, 0 } },
+       { "notice", "{notice $0-}", 2, { 0, 0 } },
+       { "ownaction", "{ownaction $0-}", 2, { 0, 0 } },
+       { "ownnotice", "{ownnotice $0-}", 2, { 0, 0 } },
        { "invite_list", "channel {channel $0} invite list: $1", 2, { 0, 0 } },
        { "no_invite_list", "channel {channel $0} invite list not set", 1, { 0 } },
        { "ban_list", "channel {channel $0} ban list: $1", 2, { 0, 0 } },

diff --git a/apps/irssi/src/silc/core/client_ops.c b/apps/irssi/src/silc/core/client_ops.c
index 841af21efd3aac7da7154bab22e597dff8c0764b..7558b9f5e316afe76ea95c34af2eb3c0dfb4ad6b 100644 (file)
--- a/apps/irssi/src/silc/core/client_ops.c
+++ b/apps/irssi/src/silc/core/client_ops.c
@@ -93,10 +93,12 @@ void silc_channel_message(SilcClient client, SilcClientConnection conn,
 
   if (flags & SILC_MESSAGE_FLAG_ACTION)
     printformat_module("fe-common/silc", server, channel->channel_name,
-                      MSGLEVEL_ACTIONS, SILCTXT_CHANNEL_ACTION, msg);
+                      MSGLEVEL_ACTIONS, SILCTXT_CHANNEL_ACTION, 
+                       nick == NULL ? "[<unknown>]" : nick->nick, msg);
   else if (flags & SILC_MESSAGE_FLAG_NOTICE)
     printformat_module("fe-common/silc", server, channel->channel_name,
-                      MSGLEVEL_NOTICES, SILCTXT_CHANNEL_NOTICE, msg);
+                      MSGLEVEL_NOTICES, SILCTXT_CHANNEL_NOTICE, 
+                       nick == NULL ? "[<unknown>]" : nick->nick, msg);
   else
     signal_emit("message public", 6, server, msg,
                nick == NULL ? "[<unknown>]" : nick->nick,

diff --git a/apps/irssi/src/silc/core/silc-channels.c b/apps/irssi/src/silc/core/silc-channels.c
index ac588e64b21fa5ce46e03c7594f8b3d504fe9844..9c1f638aae6b67c82faf259c68a768ca30f69bd2 100644 (file)
--- a/apps/irssi/src/silc/core/silc-channels.c
+++ b/apps/irssi/src/silc/core/silc-channels.c
@@ -479,7 +479,8 @@ static void command_me(const char *data, SILC_SERVER_REC *server,
                                   argv[1], argv_lens[1], TRUE);
 
   printformat_module("fe-common/silc", server, chanrec->entry->channel_name,
-                    MSGLEVEL_ACTIONS, SILCTXT_CHANNEL_OWNACTION, argv[1]);
+                    MSGLEVEL_ACTIONS, SILCTXT_CHANNEL_OWNACTION, 
+                     server->conn->local_entry->nickname, argv[1]);
 
   for (i = 0; i < argc; i++)
     silc_free(argv[i]);
@@ -526,7 +527,8 @@ static void command_action(const char *data, SILC_SERVER_REC *server,
                                   argv[2], argv_lens[2], TRUE);
 
   printformat_module("fe-common/silc", server, chanrec->entry->channel_name,
-                    MSGLEVEL_ACTIONS, SILCTXT_CHANNEL_OWNACTION, argv[2]);
+                    MSGLEVEL_ACTIONS, SILCTXT_CHANNEL_OWNACTION, 
+                     server->conn->local_entry->nickname, argv[2]);
 
   for (i = 0; i < argc; i++)
     silc_free(argv[i]);
@@ -572,7 +574,8 @@ static void command_notice(const char *data, SILC_SERVER_REC *server,
                                   argv[1], argv_lens[1], TRUE);
 
   printformat_module("fe-common/silc", server, chanrec->entry->channel_name,
-                    MSGLEVEL_NOTICES, SILCTXT_CHANNEL_OWNNOTICE, argv[1]);
+                    MSGLEVEL_NOTICES, SILCTXT_CHANNEL_OWNNOTICE, 
+                     server->conn->local_entry->nickname, argv[1]);
 
   for (i = 0; i < argc; i++)
     silc_free(argv[i]);