* Don't print signed messages when sending failed. Affected file
irssi/src/silc/core/silc-servers.c
+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
+
Wed Dec 11 21:46:19 CET 2002 Jochen Eisinger <c0ffee@penguin-breeder.org>
* Fix theme abstracts parsing. Affected files irssi/default.theme,
Wed Dec 11 21:46:19 CET 2002 Jochen Eisinger <c0ffee@penguin-breeder.org>
* Fix theme abstracts parsing. Affected files irssi/default.theme,
void silc_servers_reconnect_init(void);
void silc_servers_reconnect_deinit(void);
void silc_servers_reconnect_init(void);
void silc_servers_reconnect_deinit(void);
-static void silc_send_channel(SILC_SERVER_REC *server,
+static int silc_send_channel(SILC_SERVER_REC *server,
char *channel, char *msg,
SilcMessageFlags flags)
{
char *channel, char *msg,
SilcMessageFlags flags)
{
rec = silc_channel_find(server, channel);
if (rec == NULL || rec->entry == NULL) {
cmd_return_error(CMDERR_NOT_JOINED);
rec = silc_channel_find(server, channel);
if (rec == NULL || rec->entry == NULL) {
cmd_return_error(CMDERR_NOT_JOINED);
}
silc_client_send_channel_message(silc_client, server->conn, rec->entry,
NULL, flags, msg, strlen(msg), TRUE);
}
silc_client_send_channel_message(silc_client, server->conn, rec->entry,
NULL, flags, msg, strlen(msg), TRUE);
-static void silc_send_msg(SILC_SERVER_REC *server, char *nick, char *msg,
+static int silc_send_msg(SILC_SERVER_REC *server, char *nick, char *msg,
int msg_len, SilcMessageFlags flags)
{
PRIVMSG_REC *rec;
int msg_len, SilcMessageFlags flags)
{
PRIVMSG_REC *rec;
if (!silc_parse_userfqdn(nick, &nickname, NULL)) {
printformat_module("fe-common/silc", server, NULL,
MSGLEVEL_CRAP, SILCTXT_BAD_NICK, nick);
if (!silc_parse_userfqdn(nick, &nickname, NULL)) {
printformat_module("fe-common/silc", server, NULL,
MSGLEVEL_CRAP, SILCTXT_BAD_NICK, nick);
}
/* Find client entry */
}
/* Find client entry */
silc_client_get_clients(silc_client, server->conn,
nickname, NULL, silc_send_msg_clients, rec);
silc_free(nickname);
silc_client_get_clients(silc_client, server->conn,
nickname, NULL, silc_send_msg_clients, rec);
silc_free(nickname);
}
/* Send the private message directly */
}
/* Send the private message directly */
silc_client_send_private_message(silc_client, server->conn,
clients[0], flags,
msg, msg_len, TRUE);
silc_client_send_private_message(silc_client, server->conn,
clients[0], flags,
msg, msg_len, TRUE);
}
void silc_send_mime(SILC_SERVER_REC *server, WI_ITEM_REC *to,
}
void silc_send_mime(SILC_SERVER_REC *server, WI_ITEM_REC *to,
if (target != NULL) {
char *message = NULL;
if (target != NULL) {
char *message = NULL;
if (!silc_term_utf8()) {
len = silc_utf8_encoded_len(msg, strlen(msg), SILC_STRING_LANGUAGE);
if (!silc_term_utf8()) {
len = silc_utf8_encoded_len(msg, strlen(msg), SILC_STRING_LANGUAGE);
}
if (target_type == SEND_TARGET_CHANNEL)
}
if (target_type == SEND_TARGET_CHANNEL)
- silc_send_channel(server, target, message ? message : msg,
- SILC_MESSAGE_FLAG_UTF8 |
- SILC_MESSAGE_FLAG_SIGNED);
+ result = silc_send_channel(server, target, message ? message : msg,
+ SILC_MESSAGE_FLAG_UTF8 |
+ SILC_MESSAGE_FLAG_SIGNED);
- silc_send_msg(server, target, message ? message : msg,
- message ? strlen(message) : strlen(msg),
- SILC_MESSAGE_FLAG_UTF8 |
- SILC_MESSAGE_FLAG_SIGNED);
+ result = silc_send_msg(server, target, message ? message : msg,
+ message ? strlen(message) : strlen(msg),
+ SILC_MESSAGE_FLAG_UTF8 |
+ SILC_MESSAGE_FLAG_SIGNED);
+ if (!result)
+ goto out;
}
signal_emit(target != NULL && target_type == SEND_TARGET_CHANNEL ?
"message signed_own_public" : "message signed_own_private", 4,
server, msg, target, origtarget);
}
signal_emit(target != NULL && target_type == SEND_TARGET_CHANNEL ?
"message signed_own_public" : "message signed_own_private", 4,
server, msg, target, origtarget);
if (free_ret && target != NULL) g_free(target);
cmd_params_free(free_arg);
}
if (free_ret && target != NULL) g_free(target);
cmd_params_free(free_arg);
}