From 6b33c662504a390ccb55c966c91913bd2bea766d Mon Sep 17 00:00:00 2001
From: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>
Date: Tue, 16 Jan 2007 05:58:39 +0000
Subject: procmsg_open_data_file(): fixed a bug that the version of a data file
 was not checked when the file couldn't be opened with EACCES and reopened.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@1486 ee746299-78ed-0310-b773-934348b2243d
---
 ChangeLog          | 6 ++++++
 ChangeLog.ja       | 6 ++++++
 libsylph/procmsg.c | 4 +++-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index b5f65214..d8c26bbf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-16
+
+	* libsylph/procmsg.c: procmsg_open_data_file(): fixed a bug that the
+	  version of a data file was not checked when the file couldn't be
+	  opened with EACCES and reopened.
+
 2007-01-15
 
 	* libsylph/utils.c: get_rc_dir(): win32: use SHGetFolderPath() instead
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 08842638..b74e81a8 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,3 +1,9 @@
+2007-01-16
+
+	* libsylph/procmsg.c: procmsg_open_data_file(): データファイルが
+	  EACCES で開けずに再度開いた場合、ファイルのバージョンがチェック
+	  されないバグを修正。
+
 2007-01-15
 
 	* libsylph/utils.c: get_rc_dir(): win32: 環境変数 APPDATA でなく
diff --git a/libsylph/procmsg.c b/libsylph/procmsg.c
index 872eb1b4..3c9a430b 100644
--- a/libsylph/procmsg.c
+++ b/libsylph/procmsg.c
@@ -834,7 +834,9 @@ FILE *procmsg_open_data_file(const gchar *file, guint version,
 		} else {
 			debug_print("Mark/Cache file '%s' not found\n", file);
 		}
-	} else {
+	}
+
+	if (fp) {
 		if (buf && buf_size > 0)
 			setvbuf(fp, buf, _IOFBF, buf_size);
 		if (fread(&data_ver, sizeof(data_ver), 1, fp) != 1 ||
-- 
cgit v1.2.3