From: Colin Leroy <colin@colino.net>
Date: Tue, 5 May 2009 16:04:56 +0000 (+0000)
Subject: 2009-05-05 [colin]	3.7.1cvs50
X-Git-Tag: rel_3_7_2~37
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=f283670a867bb7d9fea6a83abd94dce7be72b6fd

2009-05-05 [colin]	3.7.1cvs50

	* src/common/utils.c
		Fix bug 1895, '(imap) cache issues when cache dir is on a
		different mountpoint than tempdir'
---

diff --git a/ChangeLog b/ChangeLog
index 6bb449f45..f911d522f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-05-05 [colin]	3.7.1cvs50
+
+	* src/common/utils.c
+		Fix bug 1895, '(imap) cache issues when cache dir is on a 
+		different mountpoint than tempdir'
+
 2009-05-04 [colin]	3.7.1cvs49
 
 	* src/msgcache.c
diff --git a/PATCHSETS b/PATCHSETS
index 1d70e77d0..9a44ebd4d 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3789,3 +3789,4 @@
 ( cvs diff -u -r 1.1.2.25 -r 1.1.2.26 src/printing.c;  ) > 3.7.1cvs47.patchset
 ( cvs diff -u -r 1.654.2.3855 -r 1.654.2.3856 configure.ac;  cvs diff -u -r 1.5.2.17 -r 1.5.2.18 src/gtk/gtkaspell.h;  ) > 3.7.1cvs48.patchset
 ( cvs diff -u -r 1.16.2.67 -r 1.16.2.68 src/msgcache.c;  ) > 3.7.1cvs49.patchset
+( cvs diff -u -r 1.36.2.169 -r 1.36.2.170 src/common/utils.c;  ) > 3.7.1cvs50.patchset
diff --git a/configure.ac b/configure.ac
index 355cdb3dc..f2f593461 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=49
+EXTRA_VERSION=50
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/common/utils.c b/src/common/utils.c
index 01578b5f2..cc752c94d 100644
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -504,7 +504,7 @@ gint file_strip_crs(const gchar *file)
 		goto unlinkout;
 	}
 	
-	if (rename_force(out, file) < 0)
++	if (move_file(out, file, TRUE) < 0)
 		goto unlinkout;
 	
 	g_free(out);