Merged silc_1_0_branch to trunk.

[silc.git] / lib / silcclient / client_ops_example.c

diff --git a/lib/silcclient/client_ops_example.c b/lib/silcclient/client_ops_example.c
index b5f5c2684030c2fc45d20037b992f329e7f19a4e..4fe166a873b54004f30519bb3ffd58b1dfd550ce 100644 (file)
--- a/lib/silcclient/client_ops_example.c
+++ b/lib/silcclient/client_ops_example.c
@@ -31,6 +31,7 @@ silc_say(SilcClient client, SilcClientConnection conn,
 static void
 silc_channel_message(SilcClient client, SilcClientConnection conn,
                     SilcClientEntry sender, SilcChannelEntry channel,
+                    SilcMessagePayload payload, SilcChannelPrivateKey key,
                     SilcMessageFlags flags, const unsigned char *message,
                     SilcUInt32 message_len)
 {
@@ -39,15 +40,15 @@ silc_channel_message(SilcClient client, SilcClientConnection conn,
 
 
 /* Private message to the client. The `sender' is the sender of the
-   message. The message is `message'and maybe NULL.  The `flags'  
+   message. The message is `message'and maybe NULL.  The `flags'
    indicates message flags  and it is used to determine how the message
    can be interpreted (like it may tell the message is multimedia
    message). */
 
 static void
 silc_private_message(SilcClient client, SilcClientConnection conn,
-                    SilcClientEntry sender, SilcMessageFlags flags,
-                    const unsigned char *message,
+                    SilcClientEntry sender, SilcMessagePayload payload,
+                    SilcMessageFlags flags, const unsigned char *message,
                     SilcUInt32 message_len)
 {
 
@@ -122,8 +123,8 @@ silc_command_reply(SilcClient client, SilcClientConnection conn,
    silc_client_close_connection. */
 
 static void
-silc_connect(SilcClient client, SilcClientConnection conn,
-            SilcClientConnectionStatus status)
+silc_connected(SilcClient client, SilcClientConnection conn,
+              SilcClientConnectionStatus status)
 {
 
 }
@@ -135,8 +136,8 @@ silc_connect(SilcClient client, SilcClientConnection conn,
    received from server. */
 
 static void
-silc_disconnect(SilcClient client, SilcClientConnection conn,
-               SilcStatus status, const char *message)
+silc_disconnected(SilcClient client, SilcClientConnection conn,
+                 SilcStatus status, const char *message)
 {
 
 }
@@ -270,8 +271,8 @@ SilcClientOperations ops = {
   silc_notify,
   silc_command,
   silc_command_reply,
-  silc_connect,
-  silc_disconnect,
+  silc_connected,
+  silc_disconnected,
   silc_get_auth_method,
   silc_verify_public_key,
   silc_ask_passphrase,