Merged silc_1_0_branch to trunk.

[silc.git] / lib / silccore / silcnotify.h

diff --git a/lib/silccore/silcnotify.h b/lib/silccore/silcnotify.h
index b95f09fd050d6b6fca66128762a4a0a5a8726fa5..41b6d7c5aaba5cc2b0e46509d88ef5c029349b62 100644 (file)
--- a/lib/silccore/silcnotify.h
+++ b/lib/silccore/silcnotify.h
@@ -4,12 +4,11 @@
  
   Author: Pekka Riikonen <priikone@silcnet.org>
  
-  Copyright (C) 1997 - 2001 Pekka Riikonen
+  Copyright (C) 1997 - 2005 Pekka Riikonen
  
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
+  the Free Software Foundation; version 2 of the License.
  
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -79,6 +78,8 @@ typedef SilcUInt16 SilcNotifyType;
 #define SILC_NOTIFY_TYPE_KILLED          13 /* Killed from the network */
 #define SILC_NOTIFY_TYPE_UMODE_CHANGE    14 /* user mode was changed */
 #define SILC_NOTIFY_TYPE_BAN             15 /* ban list change */
+#define SILC_NOTIFY_TYPE_ERROR           16 /* error notify */
+#define SILC_NOTIFY_TYPE_WATCH           17 /* watch notify */
 /***/
 
 /* Prototypes */
@@ -87,7 +88,7 @@ typedef SilcUInt16 SilcNotifyType;
  *
  * SYNOPSIS
  *
- *    SilcNotifyPayload 
+ *    SilcNotifyPayload
  *    silc_notify_payload_parse(const unsigned char *payload,
  *                              SilcUInt32 payload_len);
  *
@@ -104,14 +105,15 @@ SilcNotifyPayload silc_notify_payload_parse(const unsigned char *payload,
  *
  * SYNOPSIS
  *
- *    SilcBuffer silc_notify_payload_encode(SilcNotifyType type, SilcUInt32 argc, 
+ *    SilcBuffer silc_notify_payload_encode(SilcNotifyType type,
+ *                                          SilcUInt32 argc,
  *                                          va_list ap);
  *
  * DESCRIPTION
  *
  *    Encode notify payload with variable argument list. If `argc' is > 0
  *    argument payloads will be associated to the notify payload. Variable
- *    arguments must be {usigned char *, SilcUInt32 (len)}.
+ *    arguments must be {unsigned char *, SilcUInt32 (len)}.
  *
  ***/
 SilcBuffer silc_notify_payload_encode(SilcNotifyType type, SilcUInt32 argc, 
@@ -121,7 +123,7 @@ SilcBuffer silc_notify_payload_encode(SilcNotifyType type, SilcUInt32 argc,
  *
  * SYNOPSIS
  *
- *    SilcBuffer silc_notify_payload_encode_args(SilcNotifyType type, 
+ *    SilcBuffer silc_notify_payload_encode_args(SilcNotifyType type,
  *                                               SilcUInt32 argc,
  *                                               SilcBuffer args);
  *