Merged silc_1_1_branch to trunk.

[silc.git] / lib / silcclient / silcclient_entry.h

diff --git a/lib/silcclient/silcclient_entry.h b/lib/silcclient/silcclient_entry.h
index 94106badbd4f10ef95a4bc0085de0f20a74e7119..4b57f859bcde386d125d05cc3be20e44160df1ad 100644 (file)
--- a/lib/silcclient/silcclient_entry.h
+++ b/lib/silcclient/silcclient_entry.h
@@ -78,7 +78,7 @@
  * SOURCE
  */
 struct SilcClientEntryStruct {
-  char nickname[128 + 1];           /* Nickname */
+  char nickname[256 + 1];           /* Nickname */
   char username[128 + 1];           /* Username */
   char hostname[256 + 1];           /* Hostname */
   char server  [256 + 1];           /* SILC server name */
@@ -124,6 +124,7 @@ struct SilcClientEntryStruct {
  */
 struct SilcChannelEntryStruct {
   char *channel_name;               /* Channel name */
+  char server[256 + 1];                     /* SILC server name */
   char *topic;                      /* Current topic, may be NULL */
   SilcPublicKey founder_key;        /* Founder key, may be NULL */
   SilcDList channel_pubkeys;        /* Channel public keys, may be NULL */
@@ -442,46 +443,6 @@ SilcDList silc_client_get_clients_local(SilcClient client,
                                        const char *nickname,
                                        SilcBool return_all);
 
-/****f* silcclient/SilcClientAPI/silc_client_get_clients_by_channel
- *
- * SYNOPSIS
- *
- *    void silc_client_get_clients_by_channel(SilcClient client,
- *                                            SilcClientConnection conn,
- *                                            SilcChannelEntry channel,
- *                                            SilcGetClientCallback completion,
- *                                            void *context);
- *
- * DESCRIPTION
- *
- *    Gets client entries by the channel indicated by `channel'. Thus,
- *    it resovles the users currently on that channel. If all users are
- *    already resolved this returns the users from the channel. If the
- *    users are resolved only partially this resolves the complete user
- *    information. If no users are resolved on this channel at all, this
- *    calls USERS command to resolve all users on the channel. The `completion'
- *    will be called after the entries are available. When server returns
- *    the client information it will be cached and can be accessed locally
- *    at a later time.
- *
- *    This function can be used for example in SILC_COMMAND_JOIN command
- *    reply handling in application to resolve users on that channel.  It
- *    also can be used after calling silc_client_get_channel_resolve to
- *    resolve users on that channel.
- *
- * NOTES
- *
- *    The resolving is done with WHOIS command.  For this reason this
- *    command may take a long time because it resolves detailed user
- *    information.
- *
- ***/
-void silc_client_get_clients_by_channel(SilcClient client,
-                                       SilcClientConnection conn,
-                                       SilcChannelEntry channel,
-                                       SilcGetClientCallback completion,
-                                       void *context);
-
 /****f* silcclient/SilcClientAPI/silc_client_get_client_by_id
  *
  * SYNOPSIS
@@ -718,7 +679,7 @@ SilcChannelEntry silc_client_get_channel(SilcClient client,
  *    Resolves entry for channel by the channel name from the server.
  *    The resolving is done with IDENTIFY command. Note that users on
  *    the channel are not resolved at the same time. Use for example
- *    silc_client_get_clients_by_channel to resolve all users on a channel.
+ *    USERS command to resolve all users on a channel.
  *
  ***/
 void silc_client_get_channel_resolve(SilcClient client,
@@ -774,8 +735,7 @@ SilcChannelEntry silc_client_get_channel_by_id(SilcClient client,
  *    a pending command to it, if needed.  Returns 0 on error.
  *
  *    Note that users on the channel are not resolved at the same time.
- *    Use for example silc_client_get_clients_by_channel to resolve all
- *    users on a channel.
+ *    Use for example USERS command to resolve all users on a channel.
  *
  ***/
 SilcUInt16