Changeset 3732

Timestamp:

08/01/08 15:16:33

Author:

svillar

Message:

• Merged a bugfix from Camel upstream (revision 9244)
  

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/libtinymail-camel/camel-lite/camel/providers/local/camel-local-store.c (modified) (2 diffs)

trunk/ChangeLog

@@ +1 @@
+2008-08-01  Sergio Villar Senin  <svillar@igalia.com>
+
+        * libtinymail-camel/camel-lite/camel/providers/local/camel-local-store.c
+        (xrename):
+        use g_rename for all platforms. Merged from camel trunk where I
+        initially submitted the patch
+        
-2008-07-31  Jose Dapena Paz  <jdapena@igalia.com>
-

trunk/libtinymail-camel/camel-lite/camel/providers/local/camel-local-store.c

@@ -348 +348 @@
-                        ret = -1;
-                }
-#ifndef G_OS_WIN32
-        } else if (S_ISDIR(st.st_mode)) { /* use rename for dirs */
-                if (rename(old, new) == 0
-                    || stat(new, &st) == 0) {
-                        ret = 0;
-                } else {
-                        err = errno;
-                        ret = -1;
-                }
-        } else if (link(old, new) == 0 /* and link for files */
-                   || (stat(new, &st) == 0 && st.st_nlink == 2)) {
-                if (unlink(old) == 0) {
-                        ret = 0;
-                } else {
-                        err = errno;
-                        unlink(new);
-                        ret = -1;
-                }
-        } else {
-                err = errno;
-                ret = -1;
-#else
-        } else if ((!g_file_test (new, G_FILE_TEST_EXISTS) || g_remove (new) == 0) &&
-                   g_rename(old, new) == 0) {
@@ -376 +354 @@
-                err = errno;
-                ret = -1;
-#endif
-        }
-