From: Colin Leroy <colin@colino.net>
Date: Mon, 23 Aug 2004 07:12:50 +0000 (+0000)
Subject: 2004-08-23 [colin]	0.9.12cvs77
X-Git-Tag: rel_0_9_12a~1
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=724c1d4215623200eb75a6da5fc3999247a33b27

2004-08-23 [colin]	0.9.12cvs77

	* src/imap.c
		Try and fix bug 577 (session->last_access_time is broken since
		sync with main 0.9.12cvs2)
---

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 385c6f10d..6e91e95df 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2004-08-23 [colin]	0.9.12cvs77
+
+	* src/imap.c
+		Try and fix bug 577 (session->last_access_time is broken since 
+		sync with main 0.9.12cvs2)
+
 2004-08-23 [paul]
 
 	* po/es.po
diff --git a/PATCHSETS b/PATCHSETS
index 34d7b0588..812907e92 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -59,3 +59,4 @@
 ( cvs diff -u -r 1.437 -r 1.438 src/compose.c; ) > 0.9.12cvs74.patchset
 ( cvs diff -u -r 1.1 -r 1.2 m4/Makefile.am; ) > 0.9.12cvs75.patchset
 ( cvs diff -u -r 1.15 -r 1.16 src/plugins/trayicon/trayicon.c; ) > 0.9.12cvs76.patchset
+( cvs diff -u -r 1.205 -r 1.206 src/imap.c; ) > 0.9.12cvs77.patchset
diff --git a/configure.ac b/configure.ac
index b85a140b9..155ffd534 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=76
+EXTRA_VERSION=77
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
diff --git a/src/imap.c b/src/imap.c
index 6edc1c3c5..73b2b18b8 100644
--- a/src/imap.c
+++ b/src/imap.c
@@ -92,7 +92,6 @@ struct _IMAPSession
 	guint cmd_count;
 
 	/* CLAWS */
-	time_t last_access_time;
 	gboolean folder_content_changed;
 	guint exists;
 };
@@ -659,7 +658,7 @@ static IMAPSession *imap_session_get(Folder *folder)
 	 * A better solution than sending a NOOP every time would be
 	 * for every command to be prepared to retry until it is
 	 * successfully sent. -- mbp */
-	if (time(NULL) - session->last_access_time > SESSION_TIMEOUT_INTERVAL) {
+	if (time(NULL) - SESSION(session)->last_access_time > SESSION_TIMEOUT_INTERVAL) {
 		/* verify that the session is still alive */
 		if (imap_cmd_noop(session) != IMAP_SUCCESS) {
 			/* Check if this is the first try to establish a