From 92df8fde1ca8333ba255bfd7a3bae7da2ca27482 Mon Sep 17 00:00:00 2001 From: Pekka Riikonen Date: Sun, 16 Jun 2002 07:35:23 +0000 Subject: [PATCH] updates. --- apps/irssi/src/silc/core/silc-channels.c | 5 +++-- lib/silcclient/client_channel.c | 2 -- lib/silccrypt/silchash.c | 11 +++++------ lib/silccrypt/silchash.h | 10 +++++----- prepare | 2 +- 5 files changed, 14 insertions(+), 16 deletions(-) diff --git a/apps/irssi/src/silc/core/silc-channels.c b/apps/irssi/src/silc/core/silc-channels.c index 9c66e1f1..3aab164e 100644 --- a/apps/irssi/src/silc/core/silc-channels.c +++ b/apps/irssi/src/silc/core/silc-channels.c @@ -331,7 +331,6 @@ static void command_away(const char *data, SILC_SERVER_REC *server, printformat_module("fe-common/silc", server, NULL, MSGLEVEL_CRAP, SILCTXT_UNSET_AWAY); - server->usermode_away = FALSE; } else { /* Set the away message */ silc_client_set_away_message(silc_client, server->conn, (char *)data); @@ -339,9 +338,11 @@ static void command_away(const char *data, SILC_SERVER_REC *server, printformat_module("fe-common/silc", server, NULL, MSGLEVEL_CRAP, SILCTXT_SET_AWAY, data); - server->usermode_away = TRUE; } + server->usermode_away = set; + if (set) + server->away_reason = g_strdup((char *)data); signal_emit("away mode changed", 1, server); silc_command_exec(server, "UMODE", set ? "+g" : "-g"); diff --git a/lib/silcclient/client_channel.c b/lib/silcclient/client_channel.c index c2ffe663..37e69d71 100644 --- a/lib/silcclient/client_channel.c +++ b/lib/silcclient/client_channel.c @@ -69,10 +69,8 @@ void silc_client_send_channel_message(SilcClient client, chu->mode & SILC_CHANNEL_UMODE_CHANOP && !(chu->mode & SILC_CHANNEL_UMODE_CHANFO)) return; -#if 0 if (chu->mode & SILC_CHANNEL_UMODE_QUIET) return; -#endif /* Take the key to be used */ if (channel->mode & SILC_CHANNEL_MODE_PRIVKEY) { diff --git a/lib/silccrypt/silchash.c b/lib/silccrypt/silchash.c index 52419b0b..ed9999a2 100644 --- a/lib/silccrypt/silchash.c +++ b/lib/silccrypt/silchash.c @@ -1,16 +1,15 @@ /* - silchash.c + silchash.c - Author: Pekka Riikonen + Author: Pekka Riikonen - Copyright (C) 1997 - 2001 Pekka Riikonen + Copyright (C) 1997 - 2002 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. - + the Free Software Foundation; version 2 of the License. + 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 diff --git a/lib/silccrypt/silchash.h b/lib/silccrypt/silchash.h index b076d55f..2de31aaf 100644 --- a/lib/silccrypt/silchash.h +++ b/lib/silccrypt/silchash.h @@ -4,7 +4,7 @@ Author: Pekka Riikonen - Copyright (C) 1999 - 2002 Pekka Riikonen + Copyright (C) 1997 - 2002 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 @@ -101,16 +101,16 @@ extern DLLAPI const SilcHashObject silc_default_hash[]; #define SILC_HASH_SIM_CONTEXT_LEN "context_len" /* Macros that can be used to declare SILC Hash API functions. */ -#define SILC_HASH_API_INIT(hash) \ +#define SILC_HASH_API_INIT(hash) \ void silc_##hash##_init(void *context) #define SILC_HASH_API_UPDATE(hash) \ void silc_##hash##_update(void *context, const unsigned char *data, \ SilcUInt32 len) -#define SILC_HASH_API_FINAL(hash) \ +#define SILC_HASH_API_FINAL(hash) \ void silc_##hash##_final(void *context, unsigned char *digest) #define SILC_HASH_API_TRANSFORM(hash) \ void silc_##hash##_transform(SilcUInt32 *state, const unsigned char *buffer) -#define SILC_HASH_API_CONTEXT_LEN(hash) \ +#define SILC_HASH_API_CONTEXT_LEN(hash) \ SilcUInt32 silc_##hash##_context_len() /* Prototypes */ @@ -396,7 +396,7 @@ char *silc_hash_fingerprint(SilcHash hash, const unsigned char *data, * * DESCRIPTION * - * Utility function which can be used to create a textual bableprint + * Utility function which can be used to create a textual babbleprint * out of the data indicated by `data' of length of `data_len' bytes. * If `hash' is NULL then SHA1 hash function is used automatically. * The caller must free the returned string. diff --git a/prepare b/prepare index 980f0d99..0ac00c37 100755 --- a/prepare +++ b/prepare @@ -37,7 +37,7 @@ # SILC Distribution versions. Set here or give the version on the command # line as argument. # -SILC_VERSION=0.9.1 # Base version +SILC_VERSION=0.9.2 # Base version ############################################################################# -- 2.24.0