From: Jochen Eisinger Date: Thu, 12 Dec 2002 12:22:29 +0000 (+0000) Subject: Thu Dec 12 12:06:59 CET 2002 Jochen Eisinger X-Git-Tag: silc.client.0.9.11~35 X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=commitdiff_plain;h=7d8b84a2036745aef7f555b0eba6b25142bd4ea8 Thu Dec 12 12:06:59 CET 2002 Jochen Eisinger * Don't print signed messages when sending failed. Affected files irssi/src/silc/core/silc-[servers.c/commands.h] --- diff --git a/CHANGES b/CHANGES index 7df57066..ba5fc875 100644 --- a/CHANGES +++ b/CHANGES @@ -1,7 +1,7 @@ Thu Dec 12 12:06:59 CET 2002 Jochen Eisinger - * Don't print signed messages when sending failed. Affected file - irssi/src/silc/core/silc-servers.c + * Don't print signed messages when sending failed. Affected files + irssi/src/silc/core/silc-[servers.c/commands.h] Wed Dec 11 21:46:19 CET 2002 Jochen Eisinger diff --git a/apps/irssi/src/silc/core/silc-commands.h b/apps/irssi/src/silc/core/silc-commands.h index d2ba8367..a2832f0f 100644 --- a/apps/irssi/src/silc/core/silc-commands.h +++ b/apps/irssi/src/silc/core/silc-commands.h @@ -18,4 +18,12 @@ cmd_return_error(CMDERR_NOT_CONNECTED); \ } G_STMT_END +/* Returning from command function with error */ +#define cmd_return_error_value(a,v) \ + G_STMT_START { \ + signal_emit("error command", 1, GINT_TO_POINTER(a)); \ + signal_stop(); \ + return (v); \ + } G_STMT_END + #endif diff --git a/apps/irssi/src/silc/core/silc-servers.c b/apps/irssi/src/silc/core/silc-servers.c index f7747d2a..c6cbdb48 100644 --- a/apps/irssi/src/silc/core/silc-servers.c +++ b/apps/irssi/src/silc/core/silc-servers.c @@ -58,8 +58,7 @@ static int silc_send_channel(SILC_SERVER_REC *server, rec = silc_channel_find(server, channel); if (rec == NULL || rec->entry == NULL) { - cmd_return_error(CMDERR_NOT_JOINED); - return FALSE; + cmd_return_error_value(CMDERR_NOT_JOINED, FALSE); } silc_client_send_channel_message(silc_client, server->conn, rec->entry,