Merge commit 'origin/silc.1.1.branch'

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

diff --git a/lib/silcclient/client_entry.h b/lib/silcclient/client_entry.h
index bdd70f26f72d159ebc3d2aeed150ed94041d6887..1a7a5a1f817ac1f5b3f1f89542738374727ddbd5 100644 (file)
--- a/lib/silcclient/client_entry.h
+++ b/lib/silcclient/client_entry.h
@@ -44,11 +44,9 @@ void silc_client_del_client_entry(SilcClient client,
                                  SilcClientEntry client_entry);
 SilcBool silc_client_del_client(SilcClient client, SilcClientConnection conn,
                                SilcClientEntry client_entry);
-SilcClientEntry silc_idlist_get_client(SilcClient client,
+SilcClientEntry silc_client_get_client(SilcClient client,
                                       SilcClientConnection conn,
-                                      const char *nickname,
-                                      const char *format,
-                                      bool query);
+                                      SilcClientID *client_id);
 SilcChannelEntry silc_client_add_channel(SilcClient client,
                                         SilcClientConnection conn,
                                         const char *channel_name,
@@ -56,10 +54,10 @@ SilcChannelEntry silc_client_add_channel(SilcClient client,
                                         SilcChannelID *channel_id);
 SilcBool silc_client_del_channel(SilcClient client, SilcClientConnection conn,
                                 SilcChannelEntry channel);
-bool silc_client_replace_channel_id(SilcClient client,
-                                   SilcClientConnection conn,
-                                   SilcChannelEntry channel,
-                                   SilcChannelID *new_id);
+SilcBool silc_client_replace_channel_id(SilcClient client,
+                                       SilcClientConnection conn,
+                                       SilcChannelEntry channel,
+                                       SilcChannelID *new_id);
 SilcServerEntry silc_client_add_server(SilcClient client,
                                       SilcClientConnection conn,
                                       const char *server_name,
@@ -72,9 +70,11 @@ void silc_client_update_server(SilcClient client,
                               const char *server_info);
 SilcBool silc_client_del_server(SilcClient client, SilcClientConnection conn,
                                SilcServerEntry server);
-SilcBool silc_client_nickname_parse(SilcClient client,
-                                   SilcClientConnection conn,
-                                   char *nickname,
-                                   char **ret_nick);
+SilcUInt16 silc_client_get_clients_by_list(SilcClient client,
+                                          SilcClientConnection conn,
+                                          SilcUInt32 list_count,
+                                          SilcBuffer client_id_list,
+                                          SilcGetClientCallback completion,
+                                          void *context);
 
 #endif /* CLIENT_ENTRY_H */