X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=apps%2Firssi%2Fsrc%2Fsilc%2Fcore%2Fclient_ops.c;h=38e90d0844553855d9cc38cc2497756754e37975;hb=52e57c880aba9c5e89f59d962eb9af75670b76e0;hp=5dc0fb5c2390582116ebc243576558ea774166e0;hpb=7d87c334f2441ec55f9dd8da48be0bdae3730e55;p=silc.git

diff --git a/apps/irssi/src/silc/core/client_ops.c b/apps/irssi/src/silc/core/client_ops.c
index 5dc0fb5c..38e90d08 100644
--- a/apps/irssi/src/silc/core/client_ops.c
+++ b/apps/irssi/src/silc/core/client_ops.c
@@ -729,11 +729,10 @@ void silc_notify(SilcClient client, SilcClientConnection conn,
     name = va_arg(va, char *);
     client_entry = va_arg(va, SilcClientEntry);
 
-    memset(buf, 0, sizeof(buf));
-    snprintf(buf, sizeof(buf) - 1, "%s@%s",
-	     client_entry->username, client_entry->hostname);
-    signal_emit("message invite", 4, server, channel ? channel->channel_name :
-		name, client_entry->nickname, buf);
+    silc_snprintf(buf, sizeof(buf) - 1, "%s@%s",
+		  client_entry->username, client_entry->hostname);
+    signal_emit("message invite", 4, server, name,
+		client_entry->nickname, buf);
     break;
 
   case SILC_NOTIFY_TYPE_JOIN:
@@ -825,6 +824,35 @@ void silc_notify(SilcClient client, SilcClientConnection conn,
       if (nickrec != NULL)
 	nicklist_remove(CHANNEL(chanrec), NICK(nickrec));
     }
+
+    /* If there is only one client with this same nickname on channel now
+       change it to the base format if it is formatted nickname. */
+    if (channel) {
+      silc_client_nickname_parse(client, conn, client_entry->nickname, &name);
+      clients = silc_client_get_clients_local(client, conn, name, TRUE);
+      if (!clients || silc_dlist_count(clients) != 2) {
+	silc_free(name);
+	silc_client_list_free(client, conn, clients);
+	break;
+      }
+      silc_dlist_start(clients);
+      client_entry2 = silc_dlist_get(clients);
+      if (client_entry2 == client_entry)
+        client_entry2 = silc_dlist_get(clients);
+      if (silc_client_on_channel(channel, client_entry2)) {
+	silc_snprintf(buf, sizeof(buf), "%s", client_entry2->nickname);
+	silc_client_nickname_format(client, conn, client_entry2, TRUE);
+	if (!silc_utf8_strcasecmp(buf, client_entry2->nickname)) {
+	  nicklist_rename_unique(SERVER(server), client_entry2, buf,
+				 client_entry2, client_entry2->nickname);
+	  printformat_module("fe-common/silc", server, channel->channel_name,
+			     MSGLEVEL_CRAP, SILCTXT_CHANNEL_USER_APPEARS,
+			     buf, client_entry2->nickname);
+	}
+      }
+      silc_client_list_free(client, conn, clients);
+      silc_free(name);
+    }
     break;
 
   case SILC_NOTIFY_TYPE_SIGNOFF:
@@ -836,21 +864,16 @@ void silc_notify(SilcClient client, SilcClientConnection conn,
 
     client_entry = va_arg(va, SilcClientEntry);
     tmp = va_arg(va, char *);
+    channel = va_arg(va, SilcChannelEntry);
 
     silc_server_free_ftp(server, client_entry);
 
-    /* Print only if we have the nickname.  If this cliente has just quit
-       when we were only resolving it, it is possible we don't have the
-       nickname. */
-    if (client_entry->nickname[0]) {
-      memset(buf, 0, sizeof(buf));
-      if (client_entry->username)
-        snprintf(buf, sizeof(buf) - 1, "%s@%s",
-		 client_entry->username, client_entry->hostname);
-      signal_emit("message quit", 4, server, client_entry->nickname,
-		  client_entry->username[0] ? buf : "",
-		  tmp ? tmp : "");
-    }
+    memset(buf, 0, sizeof(buf));
+    if (client_entry->username)
+      snprintf(buf, sizeof(buf) - 1, "%s@%s",
+	       client_entry->username, client_entry->hostname);
+    signal_emit("message quit", 4, server, client_entry->nickname,
+		client_entry->username[0] ? buf : "", tmp ? tmp : "");
 
     list1 = nicklist_get_same_unique(SERVER(server), client_entry);
     for (list_tmp = list1; list_tmp != NULL; list_tmp =
@@ -860,6 +883,35 @@ void silc_notify(SilcClient client, SilcClientConnection conn,
 
       nicklist_remove(channel, nickrec);
     }
+
+    /* If there is only one client with this same nickname on channel now
+       change it to the base format if it is formatted nickname. */
+    if (channel) {
+      silc_client_nickname_parse(client, conn, client_entry->nickname, &name);
+      clients = silc_client_get_clients_local(client, conn, name, TRUE);
+      if (!clients || silc_dlist_count(clients) != 2) {
+	silc_free(name);
+	silc_client_list_free(client, conn, clients);
+	break;
+      }
+      silc_dlist_start(clients);
+      client_entry2 = silc_dlist_get(clients);
+      if (client_entry2 == client_entry)
+        client_entry2 = silc_dlist_get(clients);
+      if (silc_client_on_channel(channel, client_entry2)) {
+	silc_snprintf(buf, sizeof(buf), "%s", client_entry2->nickname);
+	silc_client_nickname_format(client, conn, client_entry2, TRUE);
+	if (!silc_utf8_strcasecmp(buf, client_entry2->nickname)) {
+	  nicklist_rename_unique(SERVER(server), client_entry2, buf,
+				 client_entry2, client_entry2->nickname);
+	  printformat_module("fe-common/silc", server, channel->channel_name,
+			     MSGLEVEL_CRAP, SILCTXT_CHANNEL_USER_APPEARS,
+			     buf, client_entry2->nickname);
+	}
+      }
+      silc_client_list_free(client, conn, clients);
+      silc_free(name);
+    }
     break;
 
   case SILC_NOTIFY_TYPE_TOPIC_SET:
@@ -1684,6 +1736,20 @@ void silc_command_reply(SilcClient client, SilcClientConnection conn,
       NICK_REC *ownnick;
 
       if (SILC_STATUS_IS_ERROR(status)) {
+	if (status == SILC_STATUS_ERR_NO_SUCH_SERVER) {
+	  char *tmp = va_arg(vp, char *);
+	  if (tmp)
+	    silc_say_error("JOIN: %s: %s", tmp,
+			   silc_get_status_message(status));
+	  return;
+	}
+	if (status == SILC_STATUS_ERR_NO_SUCH_CHANNEL) {
+	  char *tmp = va_arg(vp, char *);
+	  if (tmp)
+	    silc_say_error("JOIN: %s: %s", tmp,
+			   silc_get_status_message(status));
+	  return;
+	}
 	silc_say_error("JOIN: %s", silc_get_status_message(status));
 	return;
       }
@@ -2636,7 +2702,7 @@ typedef struct {
   void *context;
 } *GetAuthMethod;
 
-static void silc_get_auth_ask_passphrase(unsigned char *passphrase,
+static void silc_get_auth_ask_passphrase(const unsigned char *passphrase,
 					 SilcUInt32 passphrase_len,
 					 void *context)
 {