Merge branch 'master' of git://valera-ext.nynaeve.net/silc into silc.1.1.branch

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

diff --git a/apps/irssi/src/silc/core/clientutil.h b/apps/irssi/src/silc/core/clientutil.h
index dc60a0499b299363599bb39636d04f4a2e72e2b9..4b925f2f6ea2af84d29c0adfa417686dbe1f16a3 100644 (file)
--- a/apps/irssi/src/silc/core/clientutil.h
+++ b/apps/irssi/src/silc/core/clientutil.h
@@ -4,13 +4,13 @@
 
   Author: Pekka Riikonen <priikone@poseidon.pspt.fi>
 
-  Copyright (C) 1997 - 2000 Pekka Riikonen
+  Copyright (C) 1997 - 2000, 2008 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
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.
-  
+
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -31,17 +31,15 @@ void silc_client_list_pkcs();
 int silc_client_check_silc_dir();
 int silc_client_load_keys(SilcClient client);
 
-typedef enum
-{
-       KeyboardCompletionSuccess, /* Success; keyboard data returned to callback. */
-       KeyboardCompletionAborted, /* Operation was aborted after starting successfully. */
-       KeyboardCompletionFailed /* Operation was not started successfully. */
+typedef enum {
+  KeyboardCompletionSuccess, /* Success; keyboard data returned to callback. */
+  KeyboardCompletionAborted, /* Operation was aborted after starting successfully. */
+  KeyboardCompletionFailed /* Operation was not started successfully. */
 } SilcKeyboardPromptStatus;
 
-typedef void (*SILC_KEYBOARD_PROMPT_PROC)(
-       const char *line,
-       void *context,
-       SilcKeyboardPromptStatus reason);
+typedef void (*SILC_KEYBOARD_PROMPT_PROC)(const char *line,
+                                         void *context,
+                                         SilcKeyboardPromptStatus reason);
 
 /*
  * Prompt for keyboard input.
@@ -82,12 +80,11 @@ typedef void (*SILC_KEYBOARD_PROMPT_PROC)(
  * keyboard redirect operation is aborted while we are still waiting for data,
  * then we abort all callbacks until that callback returns.
  */
-bool silc_keyboard_entry_redirect(
-       SILC_KEYBOARD_PROMPT_PROC prompt_func,
-       const char *entry,
-       int flags,
-       void *data,
-       SilcAsyncOperation *async);
+SilcBool silc_keyboard_entry_redirect(SILC_KEYBOARD_PROMPT_PROC prompt_func,
+                                     const char *entry,
+                                     int flags,
+                                     void *data,
+                                     SilcAsyncOperation *async);
 
 #ifdef SILC_PLUGIN
 typedef struct {