aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2004-04-02 05:58:38 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2004-04-02 05:58:38 +0800
commitd92d8f84b3688171b08f2d7fb8316c767b6d76d7 (patch)
tree9dec704cc57d2c6964ed26a55f2fa49a0cbbe931
parentadc6bcdfee79341da44984a1fc785ca8b3e4f0c6 (diff)
downloadgsoc2013-evolution-d92d8f84b3688171b08f2d7fb8316c767b6d76d7.tar
gsoc2013-evolution-d92d8f84b3688171b08f2d7fb8316c767b6d76d7.tar.gz
gsoc2013-evolution-d92d8f84b3688171b08f2d7fb8316c767b6d76d7.tar.bz2
gsoc2013-evolution-d92d8f84b3688171b08f2d7fb8316c767b6d76d7.tar.lz
gsoc2013-evolution-d92d8f84b3688171b08f2d7fb8316c767b6d76d7.tar.xz
gsoc2013-evolution-d92d8f84b3688171b08f2d7fb8316c767b6d76d7.tar.zst
gsoc2013-evolution-d92d8f84b3688171b08f2d7fb8316c767b6d76d7.zip
Report progress. "Fixes" bug #56355.
2004-04-01 Jeffrey Stedfast <fejj@ximian.com> * em-migrate.c (cp_r): Report progress. "Fixes" bug #56355. svn path=/trunk/; revision=25290
-rw-r--r--mail/ChangeLog2
-rw-r--r--mail/em-migrate.c8
2 files changed, 7 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index c02c8bce98..e99fd3427b 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,7 @@
2004-04-01 Jeffrey Stedfast <fejj@ximian.com>
+ * em-migrate.c (cp_r): Report progress. "Fixes" bug #56355.
+
* mail-account-gui.c (signature_changed): Set the updated
sig->name on the menu item.
diff --git a/mail/em-migrate.c b/mail/em-migrate.c
index 19d44387d7..6465f1cf32 100644
--- a/mail/em-migrate.c
+++ b/mail/em-migrate.c
@@ -1356,10 +1356,12 @@ cp_r (const char *src, const char *dest)
if (stat (srcpath->str, &st) == -1)
continue;
- if (S_ISDIR (st.st_mode))
+ if (S_ISDIR (st.st_mode)) {
cp_r (srcpath->str, destpath->str);
- else
- cp (srcpath->str, destpath->str, FALSE);
+ } else {
+ em_migrate_set_folder_name (srcpath->str);
+ cp (srcpath->str, destpath->str, TRUE);
+ }
}
closedir (dir);