From: Pekka Riikonen <priikone@silcnet.org>
Date: Thu, 23 May 2002 15:10:50 +0000 (+0000)
Subject: 	updates.
X-Git-Tag: silc.toolkit.0.9.1~2
X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=commitdiff_plain;h=ceb0f95c2a96562b298a6e141de083ca0b3e2fd0

	updates.
---

diff --git a/CHANGES b/CHANGES
index f43cd96d..1b82b5d8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -11,6 +11,10 @@ Thu May 23 12:00:14 CEST 2002 Pekka Riikonen <priikone@silcnet.org>
 	  timeout, and not directly, so that other notifys can be
 	  retrieved too.  Affected file lib/silcclient/client_notify.c.
 
+	* Display notification about data messages that cannot be
+	  displayed.  Affected files irssi/src/silc/core/client_ops.c,
+	  irssi/src/fe-common/silc/module-formats.[ch].
+
 Sun May 19 18:59:00 EEST 2002 Pekka Riikonen <priikone@silcnet.org>
 
 	* Fixed the CHANNEL_CHANGE notify handling in client libary
diff --git a/apps/irssi/src/fe-common/silc/module-formats.c b/apps/irssi/src/fe-common/silc/module-formats.c
index fc1d9553..385643de 100644
--- a/apps/irssi/src/fe-common/silc/module-formats.c
+++ b/apps/irssi/src/fe-common/silc/module-formats.c
@@ -124,6 +124,7 @@ FORMAT_REC fecommon_silc_formats[] = {
 	{ "watch_killed", "Watch: {nick $0} was killed from the network", 1, { 0 } },
 	{ "watch_umode_change", "Watch: {nick $0} is now {hilight $1}", 2, { 0, 0 } },
 	{ "watch_nick_change", "Watch: {nick $0} changed nickname to {nick $1}", 2, { 0, 0 } },
+	{ "message_data", "{nick $0} sent \"{hilight $1}\" data message: cannot display", 2, { 0, 0 } },
 
 	/* File transfer messages */
 	{ NULL, "FileTransfer", 0 },
diff --git a/apps/irssi/src/fe-common/silc/module-formats.h b/apps/irssi/src/fe-common/silc/module-formats.h
index b3c613eb..5d84c79d 100644
--- a/apps/irssi/src/fe-common/silc/module-formats.h
+++ b/apps/irssi/src/fe-common/silc/module-formats.h
@@ -118,6 +118,7 @@ enum {
   SILCTXT_WATCH_KILLED,
   SILCTXT_WATCH_UMODE_CHANGE,
   SILCTXT_WATCH_NICK_CHANGE,
+  SILCTXT_MESSAGE_DATA,
 
   SILCTXT_FILL_5,
 
diff --git a/apps/irssi/src/silc/core/client_ops.c b/apps/irssi/src/silc/core/client_ops.c
index 6fca4be7..1dc96687 100644
--- a/apps/irssi/src/silc/core/client_ops.c
+++ b/apps/irssi/src/silc/core/client_ops.c
@@ -152,6 +152,9 @@ void silc_channel_message(SilcClient client, SilcClientConnection conn,
       /* It is something textual, display it */
       message = (const unsigned char *)data;
     } else {
+      printformat_module("fe-common/silc", server, channel->channel_name,
+			 MSGLEVEL_CRAP, SILCTXT_MESSAGE_DATA,
+			 nick == NULL ? "[<unknown>]" : nick->nick, type);
       message = NULL;
     }
   }
@@ -209,6 +212,10 @@ void silc_private_message(SilcClient client, SilcClientConnection conn,
       /* It is something textual, display it */
       message = (const unsigned char *)data;
     } else {
+      printformat_module("fe-common/silc", server, NULL,
+			 MSGLEVEL_CRAP, SILCTXT_MESSAGE_DATA,
+			 sender->nickname ? sender->nickname : "[<unknown>]",
+			 type);
       message = NULL;
     }
   }