undo last change

diff --git a/CHANGES b/CHANGES
index d754233aafcb14eb15de2e876ca542c24f696c30..408b8b5e617f3389309dd7d74e10db38c29efc12 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,8 +1,3 @@
-Tue Aug  8 20:32:13 CEST 2006  Jochen Eisinger <coffee@silcnet.org>
-
-       * 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 <coffee@silcnet.org>
 
        * Make gmake the default for autodist, so I can properly work

diff --git a/lib/silcclient/client.c b/lib/silcclient/client.c
index e3a0e58dae569f3b926ff52cd5eeffe04d4ae03a..6119198166981a6afcf073c910356326384c4bcd 100644 (file)
--- 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);