updates.

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

diff --git a/apps/irssi/src/silc/core/silc-channels.c b/apps/irssi/src/silc/core/silc-channels.c
index c02d61d2fc4e9724538a831d38b83fd3221db2ad..25d6b6a4e122e12375c9c3a312414d9a4a5831fc 100644 (file)
--- a/apps/irssi/src/silc/core/silc-channels.c
+++ b/apps/irssi/src/silc/core/silc-channels.c
@@ -449,6 +449,8 @@ static void event_server_signoff(SILC_SERVER_REC *server, va_list va)
   clients_count = va_arg(va, uint32);
   
   for (i = 0; i < clients_count; i++) {
+    GSList *nicks, *tmp;
+
     memset(userhost, 0, sizeof(userhost));
     if (clients[i]->username)
       snprintf(userhost, sizeof(userhost) - 1, "%s@%s",
@@ -456,6 +458,13 @@ static void event_server_signoff(SILC_SERVER_REC *server, va_list va)
     signal_emit("message quit", 4, server, clients[i]->nickname,
                clients[i]->username ? userhost : "", 
                "server signoff");
+
+    nicks = nicklist_get_same_unique(SERVER(server), clients[i]);
+    for (tmp = nicks; tmp != NULL; tmp = tmp->next->next) {
+      CHANNEL_REC *channel = tmp->data;
+      NICK_REC *nickrec = tmp->next->data;
+      nicklist_remove(channel, nickrec);
+    }
   }
 }
 
@@ -466,13 +475,14 @@ static void event_server_signoff(SILC_SERVER_REC *server, va_list va)
 static void event_kick(SILC_SERVER_REC *server, va_list va)
 {
   SilcClientConnection conn = server->conn;
-  SilcClientEntry client_entry;
+  SilcClientEntry client_entry, kicker;
   SilcChannelEntry channel_entry;
   char *tmp;
   SILC_CHANNEL_REC *chanrec;
 
   client_entry = va_arg(va, SilcClientEntry);
   tmp = va_arg(va, char *);
+  kicker = va_arg(va, SilcClientEntry);
   channel_entry = va_arg(va, SilcChannelEntry);
 
   chanrec = silc_channel_find_entry(server, channel_entry);
@@ -480,6 +490,7 @@ static void event_kick(SILC_SERVER_REC *server, va_list va)
   if (client_entry == conn->local_entry) {
     printformat_module("fe-common/silc", server, channel_entry->channel_name,
                       MSGLEVEL_CRAP, SILCTXT_CHANNEL_KICKED_YOU, 
+                      kicker->nickname,
                       channel_entry->channel_name, tmp ? tmp : "");
     if (chanrec) {
       chanrec->kicked = TRUE;
@@ -489,6 +500,7 @@ static void event_kick(SILC_SERVER_REC *server, va_list va)
     printformat_module("fe-common/silc", server, channel_entry->channel_name,
                       MSGLEVEL_CRAP, SILCTXT_CHANNEL_KICKED, 
                       client_entry->nickname,
+                      kicker->nickname,
                       channel_entry->channel_name, tmp ? tmp : "");
 
     if (chanrec) {
@@ -796,6 +808,11 @@ static void keyagr_completion(SilcClient client,
                       SILCTXT_KEY_AGREEMENT_TIMEOUT, client_entry->nickname);
     break;
     
+  case SILC_KEY_AGREEMENT_ABORTED:
+    printformat_module("fe-common/silc", i->server, NULL, MSGLEVEL_CRAP,
+                      SILCTXT_KEY_AGREEMENT_ABORTED, client_entry->nickname);
+    break;
+    
   default:
     break;
   }