Sun Mar 11 17:43:18 CET 2007 Jochen Eisinger <coffee@silcnet.org>

[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 b2317f8da2dece0001306ecc90596d5415a0da62..7f34ac9f2d1be12a8318b16b99782fa67d4fb311 100644 (file)
--- a/apps/irssi/src/silc/core/silc-servers.c
+++ b/apps/irssi/src/silc/core/silc-servers.c
@@ -33,6 +33,7 @@
 #include "settings.h"
 
 #include "servers-setup.h"
+#include "channels-setup.h"
 
 #include "client_ops.h"
 #include "silc-servers.h"
@@ -534,8 +535,14 @@ char *silc_server_get_channels(SILC_SERVER_REC *server)
   chans = g_string_new(NULL);
   for (tmp = server->channels; tmp != NULL; tmp = tmp->next) {
     CHANNEL_REC *channel = tmp->data;
+    CHANNEL_SETUP_REC *schannel;
 
-    g_string_sprintfa(chans, "%s,", channel->name);
+    if ((schannel = channel_setup_find(channel->name, server->connrec->chatnet)) && 
+        schannel->password) 
+      g_string_sprintfa(chans, "%s %s,", channel->name,
+                       schannel->password);
+    else
+      g_string_sprintfa(chans, "%s,", channel->name);
   }
 
   if (chans->len > 0)