From 9e27ec18966764dc7499087df70fc03113095047 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Thu, 1 Sep 2005 17:58:05 +0000 Subject: [PATCH] 2005-09-01 [colin] 1.9.13cvs77 * src/imap.c Maybe fix bug #795 (Connection lost IMAP) Don't try to send logout when we're disconnected. * src/summaryview.c Include locked and marked emails in HRM view --- ChangeLog-gtk2.claws | 9 +++++++++ PATCHSETS | 1 + configure.ac | 2 +- src/imap.c | 4 +++- src/summaryview.c | 3 +++ 5 files changed, 17 insertions(+), 2 deletions(-) diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index 35b35834a..27e4fa436 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,12 @@ +2005-09-01 [colin] 1.9.13cvs77 + + * src/imap.c + Maybe fix bug #795 (Connection lost IMAP) + Don't try to send logout when we're disconnected. + * src/summaryview.c + Include locked and marked emails in HRM + view + 2005-09-01 [paul] 1.9.13cvs76 * src/prefs_common.c diff --git a/PATCHSETS b/PATCHSETS index 56250a1b8..8b6943054 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -762,3 +762,4 @@ ( cvs diff -u -r 1.382.2.157 -r 1.382.2.158 src/compose.c; cvs diff -u -r 1.207.2.59 -r 1.207.2.60 src/folderview.c; cvs diff -u -r 1.8.2.8 -r 1.8.2.9 src/headerview.c; cvs diff -u -r 1.2 -r 1.3 src/headerview.h; cvs diff -u -r 1.274.2.57 -r 1.274.2.58 src/mainwindow.c; cvs diff -u -r 1.204.2.55 -r 1.204.2.56 src/prefs_common.c; cvs diff -u -r 1.103.2.27 -r 1.103.2.28 src/prefs_common.h; cvs diff -u -r 1.4.2.11 -r 1.4.2.12 src/prefs_fonts.c; cvs diff -u -r 1.395.2.118 -r 1.395.2.119 src/summaryview.c; cvs diff -u -r 1.96.2.72 -r 1.96.2.73 src/textview.c; cvs diff -u -r 1.9.2.15 -r 1.9.2.16 src/common/defs.h; ) > 1.9.13cvs74.patchset ( cvs diff -u -r 1.207.2.60 -r 1.207.2.61 src/folderview.c; cvs diff -u -r 1.20.2.6 -r 1.20.2.7 src/folderview.h; cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/prefs_summaries.c; cvs diff -u -r 1.395.2.119 -r 1.395.2.120 src/summaryview.c; ) > 1.9.13cvs75.patchset ( cvs diff -u -r 1.204.2.56 -r 1.204.2.57 src/prefs_common.c; ) > 1.9.13cvs76.patchset +( cvs diff -u -r 1.179.2.64 -r 1.179.2.65 src/imap.c; cvs diff -u -r 1.395.2.120 -r 1.395.2.121 src/summaryview.c; ) > 1.9.13cvs77.patchset diff --git a/configure.ac b/configure.ac index bbad712b4..198a711cd 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=9 MICRO_VERSION=13 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=76 +EXTRA_VERSION=77 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/imap.c b/src/imap.c index 8eb940b21..ffb281638 100644 --- a/src/imap.c +++ b/src/imap.c @@ -672,6 +672,7 @@ static IMAPSession *imap_session_get(Folder *folder) statusbar_print_all(_("IMAP4 connection to %s has been" " disconnected. Reconnecting...\n"), folder->account->recv_server); + SESSION(session)->state = SESSION_DISCONNECTED; session_destroy(SESSION(session)); /* Clear folders session to make imap_session_get create a new session, because of rfolder->session == NULL @@ -819,7 +820,8 @@ static void imap_session_authenticate(IMAPSession *session, static void imap_session_destroy(Session *session) { - imap_threaded_disconnect(IMAP_SESSION(session)->folder); + if (session->state != SESSION_DISCONNECTED) + imap_threaded_disconnect(IMAP_SESSION(session)->folder); imap_free_capabilities(IMAP_SESSION(session)); g_free(IMAP_SESSION(session)->mbox); diff --git a/src/summaryview.c b/src/summaryview.c index 4f1de27ea..04b85eda9 100644 --- a/src/summaryview.c +++ b/src/summaryview.c @@ -912,6 +912,9 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item) if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)) not_killed = g_slist_prepend(not_killed, msginfo); + else if (MSG_IS_MARKED(msginfo->flags) || + MSG_IS_LOCKED(msginfo->flags)) + not_killed = g_slist_prepend(not_killed, msginfo); else if (is_refresh && (msginfo->msgnum == selected_msgnum || msginfo->msgnum == displayed_msgnum)) -- 2.25.1