From 016a74a0bb346124e921b16913fe78e6eddc0920 Mon Sep 17 00:00:00 2001 From: Jochen Eisinger Date: Mon, 12 Jan 2004 12:04:03 +0000 Subject: [PATCH] Mon Jan 12 13:01:10 CET 2004 Jochen Eisinger * When resuming a session fails, notify the user that the session file needs to be removed eventually. Affected files irssi/src/fe-common/silc/module-formats.[ch], irssi/src/silc/core/client_ops.c. --- CHANGES | 7 ++++++ .../irssi/src/fe-common/silc/module-formats.c | 1 + .../irssi/src/fe-common/silc/module-formats.h | 1 + apps/irssi/src/silc/core/client_ops.c | 23 +++++++++++++++---- 4 files changed, 27 insertions(+), 5 deletions(-) diff --git a/CHANGES b/CHANGES index 2fc9a8da..3e9a8c81 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,10 @@ +Mon Jan 12 13:01:10 CET 2004 Jochen Eisinger + + * When resuming a session fails, notify the user that the session + file needs to be removed eventually. Affected files + irssi/src/fe-common/silc/module-formats.[ch], + irssi/src/silc/core/client_ops.c. + Tue Jan 04 12:16:04 CET 2004 Jochen Eisinger * Added DIST_SUBDIRS symbols to include all subdirs in distributions. diff --git a/apps/irssi/src/fe-common/silc/module-formats.c b/apps/irssi/src/fe-common/silc/module-formats.c index 88736464..85a24c4d 100644 --- a/apps/irssi/src/fe-common/silc/module-formats.c +++ b/apps/irssi/src/fe-common/silc/module-formats.c @@ -190,6 +190,7 @@ FORMAT_REC fecommon_silc_formats[] = { { "message_data", "{nick $0} sent \"{hilight $1}\" data message: cannot display", 2, { 0, 0 } }, { "stats", "$[25]0: {hilight $1}", 2, { 0, 0 } }, { "reattach", "Resuming old session on {hilight $0}, may take a while ...", 1, { 0 } }, + { "reattach_failed", "Resuming session failed, you may want to remove {hilight $0} before the next connection attempt", 1, { 0 } }, /* File transfer messages */ { NULL, "FileTransfer", 0 }, diff --git a/apps/irssi/src/fe-common/silc/module-formats.h b/apps/irssi/src/fe-common/silc/module-formats.h index 27a94e9e..2c4c064b 100644 --- a/apps/irssi/src/fe-common/silc/module-formats.h +++ b/apps/irssi/src/fe-common/silc/module-formats.h @@ -185,6 +185,7 @@ enum { SILCTXT_MESSAGE_DATA, SILCTXT_STATS, SILCTXT_REATTACH, + SILCTXT_REATTACH_FAILED, SILCTXT_FILL_5, diff --git a/apps/irssi/src/silc/core/client_ops.c b/apps/irssi/src/silc/core/client_ops.c index d47dfc99..3b5ca0cc 100644 --- a/apps/irssi/src/silc/core/client_ops.c +++ b/apps/irssi/src/silc/core/client_ops.c @@ -1302,11 +1302,24 @@ void silc_connect(SilcClient client, SilcClientConnection conn, break; default: - server->connection_lost = TRUE; - if (server->conn) - server->conn->context = NULL; - server_disconnect(SERVER(server)); - break; + { + char * file; + + file = silc_get_session_filename(server); + + if (silc_file_size(file) > 0) + printformat_module("fe-common/silc", server, NULL, + MSGLEVEL_CRAP, SILCTXT_REATTACH_FAILED, file); + + silc_free(file); + + server->connection_lost = TRUE; + if (server->conn) + server->conn->context = NULL; + server_disconnect(SERVER(server)); + + break; + } } } -- 2.24.0