aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2004-04-03 05:07:14 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2004-04-03 05:07:14 +0800
commita50e26d6555a450f9f2f9bddeb5e2ecc447db665 (patch)
treecb4805bc0903fb1cade6253f5504dc312a6fcc5e
parent2949a505853a87a525831e73af88cd4819892f6f (diff)
downloadgsoc2013-evolution-a50e26d6555a450f9f2f9bddeb5e2ecc447db665.tar
gsoc2013-evolution-a50e26d6555a450f9f2f9bddeb5e2ecc447db665.tar.gz
gsoc2013-evolution-a50e26d6555a450f9f2f9bddeb5e2ecc447db665.tar.bz2
gsoc2013-evolution-a50e26d6555a450f9f2f9bddeb5e2ecc447db665.tar.lz
gsoc2013-evolution-a50e26d6555a450f9f2f9bddeb5e2ecc447db665.tar.xz
gsoc2013-evolution-a50e26d6555a450f9f2f9bddeb5e2ecc447db665.tar.zst
gsoc2013-evolution-a50e26d6555a450f9f2f9bddeb5e2ecc447db665.zip
Revert my "fix" from yesterday. We can't necessarily show progress
2004-04-02 Jeffrey Stedfast <fejj@ximian.com> * em-migrate.c (cp_r): Revert my "fix" from yesterday. We can't necessarily show progress (progress window may have been destroyed already). svn path=/trunk/; revision=25307
-rw-r--r--mail/ChangeLog4
-rw-r--r--mail/em-migrate.c3
2 files changed, 5 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 6dfb06df10..fdf26fb29a 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,9 @@
2004-04-02 Jeffrey Stedfast <fejj@ximian.com>
+ * em-migrate.c (cp_r): Revert my "fix" from yesterday. We can't
+ necessarily show progress (progress window may have been destroyed
+ already).
+
Fixes bug #53851
* em-folder-view.c (emfv_popup_move_cb): Save the uri as the
diff --git a/mail/em-migrate.c b/mail/em-migrate.c
index 6465f1cf32..d434e8b535 100644
--- a/mail/em-migrate.c
+++ b/mail/em-migrate.c
@@ -1359,8 +1359,7 @@ cp_r (const char *src, const char *dest)
if (S_ISDIR (st.st_mode)) {
cp_r (srcpath->str, destpath->str);
} else {
- em_migrate_set_folder_name (srcpath->str);
- cp (srcpath->str, destpath->str, TRUE);
+ cp (srcpath->str, destpath->str, FALSE);
}
}