updates.

[silc.git] / lib / silcclient / client_notify.c

diff --git a/lib/silcclient/client_notify.c b/lib/silcclient/client_notify.c
index 1e7778583f6e864b8ab307ff57f2484d4bf980c9..c13030695bb6c2544828ff63cf2bfb0f946c775f 100644 (file)
--- a/lib/silcclient/client_notify.c
+++ b/lib/silcclient/client_notify.c
@@ -223,9 +223,10 @@ void silc_client_notify_by_server(SilcClient client,
        client_entry->status &= ~SILC_CLIENT_STATUS_RESOLVING;
        goto out;
       }
-      client_entry->status |= SILC_CLIENT_STATUS_RESOLVING;
       silc_client_notify_by_server_resolve(client, conn, packet, 
                                           SILC_ID_CLIENT, client_id);
+      client_entry->status |= SILC_CLIENT_STATUS_RESOLVING;
+      client_entry->resolve_cmd_ident = conn->cmd_ident;
       goto out;
     } else {
       if (client_entry != conn->local_entry)
@@ -456,7 +457,7 @@ void silc_client_notify_by_server(SilcClient client,
       goto out;
 
     /* Ignore my ID */
-    if (SILC_ID_CLIENT_COMPARE(client_id, conn->local_id))
+    if (conn->local_id && SILC_ID_CLIENT_COMPARE(client_id, conn->local_id))
       break;
 
     /* Find old Client entry */
@@ -482,6 +483,31 @@ void silc_client_notify_by_server(SilcClient client,
     tmp = silc_argument_get_arg_type(args, 3, NULL);
     if (tmp) {
       /* Protocol version 1.1 */
+      char *tmp_nick = NULL;
+
+      /* Check whether nickname changed at all.  It is possible that nick
+        change notify is received but nickname didn't changed, only the
+        ID changes. */
+      if (client->internal->params->nickname_parse)
+       client->internal->params->nickname_parse(client_entry->nickname,
+                                                &tmp_nick);
+      else
+       tmp_nick = strdup(tmp);
+
+      if (tmp_nick && !strcmp(tmp, tmp_nick)) {
+       /* Nickname didn't change. Update only the ID */
+       silc_idcache_del_by_context(conn->client_cache, client_entry);
+       silc_free(client_entry->id);
+       client_entry->id = silc_id_dup(client_id, SILC_ID_CLIENT);
+       silc_idcache_add(conn->client_cache, strdup(tmp),
+                        client_entry->id, client_entry, 0, NULL);
+
+       /* Notify application */
+       client->internal->ops->notify(client, conn, type, 
+                                     client_entry, client_entry);
+       break;
+      }
+      silc_free(tmp_nick);
 
       /* Create new client entry, and save all old information with the
         new nickname and client ID */