Merge commit 'origin/silc.1.1.branch'

[silc.git] / apps / irssi / src / silc / core / silc-servers.c

diff --git a/apps/irssi/src/silc/core/silc-servers.c b/apps/irssi/src/silc/core/silc-servers.c
index ba0dc80ae19d214a45c2978649ea2d83d62e5975..bfd5f600e5e67012156f3990fa1c21d6edb0f41a 100644 (file)
--- a/apps/irssi/src/silc/core/silc-servers.c
+++ b/apps/irssi/src/silc/core/silc-servers.c
@@ -102,9 +102,14 @@ static void silc_send_msg_clients(SilcClient client,
   clients = silc_client_get_clients_local(silc_client, server->conn,
                                          rec->nick, FALSE);
   if (!clients) {
-    printtext(NULL, NULL, MSGLEVEL_CLIENTERROR,
-             "%s: There is no such client (did you mean %s?)", rec->nick,
-             target->nickname);
+    if (strchr(rec->nick, '@') && target->server)
+      printtext(NULL, NULL, MSGLEVEL_CLIENTERROR,
+               "%s: There is no such client (did you mean %s@%s?)", rec->nick,
+               target->nickname, target->server);
+    else
+      printtext(NULL, NULL, MSGLEVEL_CLIENTERROR,
+               "%s: There is no such client (did you mean %s?)", rec->nick,
+               target->nickname);
     goto out;
   }
 
@@ -413,7 +418,7 @@ static void sig_connected_stream_created(SilcSocketStreamStatus status,
 
   /* Try to read detached session data and use it if found. */
   file = silc_get_session_filename(server);
-  params.detach_data = silc_file_readfile(file, &params.detach_data_len);
+  params.detach_data = silc_file_readfile(file, &params.detach_data_len, NULL);
   if (params.detach_data)
     params.detach_data[params.detach_data_len] = 0;
   if (params.detach_data)