X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=apps%2Firssi%2Fsrc%2Fsilc%2Fcore%2Fsilc-channels.c;h=054e5d4d276f070e29cd9587e2767d79f4d0ffcd;hb=6102b7fda33850dc675eb711aca7dc935453dcc9;hp=fa50947d524c06187b2fe04d821043e89d3f6ca5;hpb=63ce9e3eb1938cee8672fd914531cea4543bb79f;p=silc.git

diff --git a/apps/irssi/src/silc/core/silc-channels.c b/apps/irssi/src/silc/core/silc-channels.c
index fa50947d..054e5d4d 100644
--- a/apps/irssi/src/silc/core/silc-channels.c
+++ b/apps/irssi/src/silc/core/silc-channels.c
@@ -245,7 +245,7 @@ static void event_topic(SILC_SERVER_REC *server, va_list va)
   char userhost[256];
   SilcIdType idtype;
 
-  idtype = va_arg(va, int);
+  idtype = va_arg(va, SilcIdType);
   entry = va_arg(va, void *);
   topic = va_arg(va, char *);
   channel = va_arg(va, SilcChannelEntry);
@@ -344,9 +344,11 @@ static void event_cmode(SILC_SERVER_REC *server, va_list va)
   channel = va_arg(va, SilcChannelEntry);
 
   mode = silc_client_chmode(modei, 
-			    channel->channel_key->cipher->name,
-			    silc_hmac_get_name(channel->hmac));
-  
+			    channel->channel_key ? 
+			    channel->channel_key->cipher->name : "",
+			    channel->hmac ? 
+			    silc_hmac_get_name(channel->hmac) : "");
+
   chanrec = silc_channel_find_entry(server, channel);
   if (chanrec != NULL) {
     g_free_not_null(chanrec->mode);