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 6bb449f45e053c56e19dfe40fc8efbf169c96f46..f911d522fd23f6e6555bc5aef6a94a77180455c2 100644 (file)
--- 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 1d70e77d042552c0ae8792bd6758d2d16c107369..9a44ebd4d91312604fd6f012a87327cc00d61e2f 100644 (file)
--- 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 355cdb3dc80529cff9f46f6aa03564b6fb7bb02b..f2f5934617cd46bf54cc0ca8af19a5023dee58bb 100644 (file)
--- 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 01578b5f2abb43afdd924d2359e05a90e64d49a5..cc752c94db9f0b0a8e134af6ecb06a4d12b24061 100644 (file)
--- 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);