From: Pekka Riikonen <priikone@silcnet.org>
Date: Thu, 7 Apr 2005 17:25:03 +0000 (+0000)
Subject: 	Handle the resolver counter correctly in get_users_by_channel
X-Git-Tag: silc.toolkit.0.9.14~35
X-Git-Url: http://git.silcnet.org/gitweb/?a=commitdiff_plain;h=355558e1dd8a9e4f1e176c6c3cfc139351ea25a3;p=silc.git

	Handle the resolver counter correctly in get_users_by_channel
	callback.
---

diff --git a/CHANGES b/CHANGES
index e3068e8b..751249b5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,10 @@ Thu Apr  7 14:50:01 EEST 2005  Pekka Riikonen <priikone@silcnet.org>
 	* Check for valid channel creation in JOIN command reply.
 	  Affected file lib/silcclient/command_reply.c.
 
+	* Handle the resolver counter in silc_client_get_users_by_channel
+	  callback correctly.  Fixed auto-join bug in Gaim.  Affected
+	  file lib/silcclient/idlist.c.
+
 Wed Apr  6 16:56:53 EEST 2005  Pekka Riikonen <priikone@silcnet.org>
 
 	* Added some better error messages.  Affected file
diff --git a/lib/silcclient/idlist.c b/lib/silcclient/idlist.c
index 51cba4e3..2e5d61be 100644
--- a/lib/silcclient/idlist.c
+++ b/lib/silcclient/idlist.c
@@ -700,6 +700,12 @@ SILC_CLIENT_CMD_FUNC(get_clients_by_channel_cb)
   SilcHashTableList htl;
   SilcChannelUser chu;
 
+  if (i->res_count) {
+    i->res_count--;
+    if (i->res_count)
+      return;
+  }
+
   channel = silc_client_get_channel_by_id(i->client, i->conn, &i->channel_id);
   if (channel && !silc_hash_table_count(channel->user_list)) {
     clients = silc_calloc(silc_hash_table_count(channel->user_list),