Thu Dec 12 12:06:59 CET 2002 Jochen Eisinger <c0ffee@penguin-breeder.org>

	* 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 7df57066fa12b85a17bb794fee98f8e574e51a02..ba5fc8759cc75b248a3a83e6ca244572a9e278fe 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,7 @@
 Thu Dec 12 12:06:59 CET 2002 Jochen Eisinger <c0ffee@penguin-breeder.org>
 
-       * 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 <c0ffee@penguin-breeder.org>
 

diff --git a/apps/irssi/src/silc/core/silc-commands.h b/apps/irssi/src/silc/core/silc-commands.h
index d2ba8367f46cc9c6814ca3d9bd76d5a187dc23c7..a2832f0f94924656acad4d98216c163d0fd65540 100644 (file)
--- 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 f7747d2a5f13f3ee491abf9049ea7bef0d15886d..c6cbdb4889ce46b0bc7fb4a4cd4715fee43f8dd1 100644 (file)
--- 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,