+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
( 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
MICRO_VERSION=13
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=76
+EXTRA_VERSION=77
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
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
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);
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))