From 7f62aa073c2cc651aaceb66b7555d5786eb387f4 Mon Sep 17 00:00:00 2001 From: Jochen Eisinger Date: Tue, 8 Aug 2006 18:58:35 +0000 Subject: [PATCH] undo last change --- CHANGES | 5 ----- lib/silcclient/client.c | 7 ++++--- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/CHANGES b/CHANGES index d754233a..408b8b5e 100644 --- a/CHANGES +++ b/CHANGES @@ -1,8 +1,3 @@ -Tue Aug 8 20:32:13 CEST 2006 Jochen Eisinger - - * Always issue a NICK command on connection (if a nickname was - given at all). Affected file lib/silcclient/client.c - Sun Jul 2 19:12:36 CEST 2006 Jochen Eisinger * Make gmake the default for autodist, so I can properly work diff --git a/lib/silcclient/client.c b/lib/silcclient/client.c index e3a0e58d..61191981 100644 --- a/lib/silcclient/client.c +++ b/lib/silcclient/client.c @@ -1805,9 +1805,10 @@ void silc_client_receive_new_id(SilcClient client, silc_buffer_free(sidp); if (!conn->internal->params.detach_data) { - /* Send NICK command if the nickname was set by the application. - Send this with little timeout. */ - if (client->nickname) + /* Send NICK command if the nickname was set by the application (and is + not same as the username). Send this with little timeout. */ + if (client->nickname && + !silc_utf8_strcasecmp(client->nickname, client->username)) silc_schedule_task_add(client->schedule, 0, silc_client_send_auto_nick, conn, 1, 0, SILC_TASK_TIMEOUT, SILC_TASK_PRI_NORMAL); -- 2.24.0