Merge commit 'origin/silc.1.1.branch'

[silc.git] / apps / irssi / src / silc / core / clientutil.c

diff --git a/apps/irssi/src/silc/core/clientutil.c b/apps/irssi/src/silc/core/clientutil.c
index 7c8031aad1cc7113905ef7b9ac1b1ccb532528dd..c1632fea0d621615e278ab289df1c352b81c318c 100644 (file)
--- a/apps/irssi/src/silc/core/clientutil.c
+++ b/apps/irssi/src/silc/core/clientutil.c
@@ -4,7 +4,7 @@
 
   Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 1997 - 2006 Pekka Riikonen
+  Copyright (C) 1997 - 2007 Pekka Riikonen
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -52,7 +52,7 @@ void silc_client_print_list(char *list)
   int i=0;
 
   items = g_strsplit(list, ",", -1);
-  
+
   while (items[i] != NULL)
     printformat_module("fe-common/silc", NULL, NULL,
                       MSGLEVEL_CRAP, SILCTXT_CONFIG_LIST,
@@ -66,7 +66,7 @@ void silc_client_print_list(char *list)
 
 void silc_client_list_ciphers()
 {
-  char *ciphers = silc_cipher_get_supported();
+  char *ciphers = silc_cipher_get_supported(FALSE);
 #ifdef SILC_PLUGIN
   printformat_module("fe-common/silc", NULL, NULL,
                     MSGLEVEL_CRAP, SILCTXT_CONFIG_ALGOS,
@@ -371,8 +371,6 @@ int silc_client_load_keys(SilcClient client)
 }
 
 #ifdef SILC_PLUGIN
-extern void irssi_redraw(void); /* dirty, I know */
-
 void create_key_passphrase(const char *answer, CREATE_KEY_REC *rec)
 {
   char priv_key_file[128], pub_key_file[128];
@@ -418,8 +416,6 @@ void create_key_passphrase(const char *answer, CREATE_KEY_REC *rec)
   g_free(rec->passphrase);
   g_free(rec->pkcs);
   g_free(rec);
-  irssi_redraw();
-  
 }
 
 void change_private_key_passphrase(const char *answer, CREATE_KEY_REC *rec)
@@ -434,7 +430,7 @@ void change_private_key_passphrase(const char *answer, CREATE_KEY_REC *rec)
                            ENTRY_REDIRECT_FLAG_HIDDEN, rec);
     return;
   }
-  
+
   if ((rec->passphrase == NULL) && (answer) && (*answer != '\0')) {
     rec->passphrase = g_strdup(answer);
     keyboard_entry_redirect((SIGNAL_FUNC) change_private_key_passphrase,
@@ -458,7 +454,7 @@ void change_private_key_passphrase(const char *answer, CREATE_KEY_REC *rec)
   }
 
   if (silc_change_private_key_passphrase(rec->file, rec->old,
-                                    (rec->passphrase == NULL ? 
+                                    (rec->passphrase == NULL ?
                                      "" : rec->passphrase)) == TRUE)
     printformat_module("fe-common/silc", NULL, NULL,
                       MSGLEVEL_CRAP, SILCTXT_CONFIG_PASSCHANGE);