From 55de7a6e28199ec0620b8edc59af256578007969 Mon Sep 17 00:00:00 2001
From: Paul Mangan <paul@claws-mail.org>
Date: Thu, 17 Jun 2004 09:55:22 +0000
Subject: [PATCH] sync with main 0.9.12 release

---
 ChangeLog            | 25 +++++++++++++++++++++++++
 ChangeLog.claws      |  7 +++++++
 ChangeLog.jp         | 26 ++++++++++++++++++++++++++
 NEWS                 |  7 +++++++
 configure.ac         |  2 +-
 src/common/session.c |  2 ++
 6 files changed, 68 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index aaa8da9d5..67132c62c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+2004-06-17
+
+	* version 0.9.12
+
+2004-06-17
+
+	* src/session.c: session_set_timeout(): fixed a bug that didn't
+	  reset timeout_tag when interval is 0.
+
+2004-06-16
+
+	* src/gtkstext.c: gtk_stext_update_text(): added null checking for
+	  cache (thanks to Jim Hranicky).
+
+2004-06-15
+
+	* src/defs.h: increased CACHE_VERSION to work around the
+	  incompatibility of the cache on some platforms (ex. FreeBSD).
+	* src/procmsg.c: procmsg_read_cache(): discard all read cache data
+	  if an error occurred.
+
+2004-06-10
+
+	* src/summaryview.[ch]: hide 'Re-edit' menu when it's unusable.
+
 2004-06-08
 
 	* src/inc.[ch]
diff --git a/ChangeLog.claws b/ChangeLog.claws
index f1f40d0f5..7b23e0e09 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,10 @@
+2004-06-17 [paul]	0.9.11cvs13
+	
+	* sync with main 0.9.12 release
+	  src/session.c
+		session_set_timeout(): fixed a bug that didn't
+	  	reset timeout_tag when interval is 0.
+
 2004-06-16 [christoph]	0.9.11cvs12
 
 	* src/textview.c
diff --git a/ChangeLog.jp b/ChangeLog.jp
index fa93e7c65..91d8da9ff 100644
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,29 @@
+2004-06-17
+
+	* version 0.9.12
+
+2004-06-17
+
+	* src/session.c: session_set_timeout(): interval ¤¬ 0 ¤Î¤È¤­
+	  timeout_tag ¤ò¥ê¥»¥Ã¥È¤·¤Æ¤¤¤Ê¤«¤Ã¤¿¥Ð¥°¤ò½¤Àµ¡£
+
+2004-06-16
+
+	* src/gtkstext.c: gtk_stext_update_text(): cache ¤Î null ¥Á¥§¥Ã¥¯¤ò
+	  ÄɲÃ(Jim Hranicky ¤µ¤ó thanks)¡£
+
+2004-06-15
+
+	* src/defs.h: ÆÃÄê¤Î¥×¥é¥Ã¥È¥Õ¥©¡¼¥à(Îã: FreeBSD)¤Ë¤ª¤±¤ë¥­¥ã¥Ã¥·¥å
+	  ¤ÎÈó¸ß´¹À­ÌäÂê¤ËÂн褹¤ë¤¿¤á¤Ë CACHE_VERSION ¤òÁý²Ã¡£
+	* src/procmsg.c: procmsg_read_cache(): ¥¨¥é¡¼¤¬È¯À¸¤·¤¿¤éÆɤ߹þ¤ó¤À
+	  ¥­¥ã¥Ã¥·¥å¥Ç¡¼¥¿¤òÁ´¤ÆÇË´þ¤¹¤ë¤è¤¦¤Ë¤·¤¿¡£
+
+2004-06-10
+
+	* src/summaryview.[ch]: »ÈÍÑÉÔ²Äǽ¤Ê¤È¤­¤Ï¡ÖºÆÊÔ½¸¡×¥á¥Ë¥å¡¼¤ò±£¤¹
+	  ¤è¤¦¤Ë¤·¤¿¡£
+
 2004-06-08
 
 	* src/inc.[ch]
diff --git a/NEWS b/NEWS
index 626e4fd58..79c37f547 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,12 @@
 Changes of Sylpheed
 
+* 0.9.12
+
+    * A session timeout for POP3/SMTP has been implemented.
+    * The 'Print' menu on the context menu has been restored.
+    * the value of CACHE_VERSION has been increased to prevent a cache
+      incompatibility problem on some platforms such as FreeBSD.
+
 * 0.9.11
 
     * The spring-loaded folder has been implemented for the folder view.
diff --git a/configure.ac b/configure.ac
index 6d813ba4f..ca60fba08 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=11
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=12
+EXTRA_VERSION=13
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
diff --git a/src/common/session.c b/src/common/session.c
index 22feccc0a..fcedc19ce 100644
--- a/src/common/session.c
+++ b/src/common/session.c
@@ -214,6 +214,8 @@ void session_set_timeout(Session *session, guint interval)
 	if (interval > 0)
 		session->timeout_tag =
 			g_timeout_add(interval, session_timeout_cb, session);
+	else
+		session->timeout_tag = 0;
 }
 
 static gboolean session_timeout_cb(gpointer data)
-- 
2.25.1