Integer type name change.
[silc.git] / apps / silc / local_command.c
index 509b4fa2c52f89b35f26dab15d310aaa202cef3f..76c5c5bf8824faf0d22ad2bb3254aeea1f647cc3 100644 (file)
@@ -97,7 +97,7 @@ SILC_CLIENT_LCMD_FUNC(msg)
   SilcClientConnection conn = cmd->conn;
   SilcClient client = cmd->client;
   SilcClientEntry client_entry = NULL;
-  uint32 num = 0;
+  SilcUInt32 num = 0;
   char *nickname = NULL, *server = NULL;
 
   if (!cmd->conn) {
@@ -304,7 +304,7 @@ static void keyagr_completion(SilcClient client,
       /* Set the private key for this client */
       silc_client_del_private_message_key(client, conn, client_entry);
       silc_client_add_private_message_key_ske(client, conn, client_entry,
-                                             NULL, key);
+                                             NULL, key, FALSE);
       silc_say(client, conn, "The private messages with the %s are now protected with the private key", client_entry->nickname);
       silc_ske_free_key_material(key);
     }
@@ -349,7 +349,7 @@ SILC_CLIENT_LCMD_FUNC(key)
   SilcClient client = cmd->client;
   SilcClientEntry client_entry = NULL;
   SilcChannelEntry channel_entry = NULL;
-  uint32 num = 0;
+  SilcUInt32 num = 0;
   char *nickname = NULL, *server = NULL;
   int command = 0, port = 0, type = 0;
   char *hostname = NULL;
@@ -410,7 +410,7 @@ SILC_CLIENT_LCMD_FUNC(key)
 
     if (cmd->argv[2][0] == '*') {
       if (!conn->current_channel) {
-       cmd->client->ops->say(cmd->client, conn, "You are not on any channel");
+       silc_say(cmd->client, conn, "You are not on any channel");
        goto out;
       }
       name = conn->current_channel->channel_name;
@@ -433,7 +433,7 @@ SILC_CLIENT_LCMD_FUNC(key)
       if (curr_key && type == 1 && client_entry) {
        silc_client_del_private_message_key(client, conn, client_entry);
        silc_client_add_private_message_key_ske(client, conn, client_entry,
-                                               NULL, curr_key);
+                                               NULL, curr_key, FALSE);
        goto out;
       }
     }
@@ -449,13 +449,13 @@ SILC_CLIENT_LCMD_FUNC(key)
                                              cmd->argv[5], cmd->argv[4],
                                              cmd->argv_lens[4],
                                              (cmd->argv[4][0] == '*' ?
-                                              TRUE : FALSE));
+                                              TRUE : FALSE), FALSE);
        else
          silc_client_add_private_message_key(client, conn, client_entry,
                                              NULL, cmd->argv[4],
                                              cmd->argv_lens[4],
                                              (cmd->argv[4][0] == '*' ?
-                                              TRUE : FALSE));
+                                              TRUE : FALSE), FALSE);
 
        /* Send the key to the remote client so that it starts using it
           too. */
@@ -498,7 +498,7 @@ SILC_CLIENT_LCMD_FUNC(key)
     } else if (type == 2) {
       /* Unset channel key(s) */
       SilcChannelPrivateKey *keys;
-      uint32 keys_count;
+      SilcUInt32 keys_count;
       int number;
 
       if (cmd->argc == 4)
@@ -532,7 +532,7 @@ SILC_CLIENT_LCMD_FUNC(key)
 
     if (type == 1) {
       SilcPrivateMessageKeys keys;
-      uint32 keys_count;
+      SilcUInt32 keys_count;
       int k, i, len;
       char buf[1024];
 
@@ -607,7 +607,7 @@ SILC_CLIENT_LCMD_FUNC(key)
       silc_client_free_private_message_keys(keys, keys_count);
     } else if (type == 2) {
       SilcChannelPrivateKey *keys;
-      uint32 keys_count;
+      SilcUInt32 keys_count;
       int k, i, len;
       char buf[1024];
 
@@ -728,7 +728,7 @@ SILC_CLIENT_LCMD_FUNC(me)
 
   if (cmd->argv[1][0] == '*') {
     if (!conn->current_channel) {
-      cmd->client->ops->say(cmd->client, conn, "You are not on any channel");
+      silc_say(cmd->client, conn, "You are not on any channel");
       goto out;
     }
     name = conn->current_channel->channel_name;
@@ -776,7 +776,7 @@ SILC_CLIENT_LCMD_FUNC(notice)
 
   if (cmd->argv[1][0] == '*') {
     if (!conn->current_channel) {
-      cmd->client->ops->say(cmd->client, conn, "You are not on any channel");
+      silc_say(cmd->client, conn, "You are not on any channel");
       goto out;
     }
     name = conn->current_channel->channel_name;