From d23a9d84e4f5f1c543969f176b40c87a878048f4 Mon Sep 17 00:00:00 2001
From: Nick Bebout <nb@fedoraproject.org>
Date: Sat, 12 Mar 2011 02:44:09 +0000
Subject: [PATCH] 1.108

---
 CREDITS   |  1 +
 ChangeLog |  8 ++++++--
 README    |  4 ++--
 TODO      |  3 +++
 VERSION   |  2 +-
 imapsync  | 15 ++++++++-------
 6 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/CREDITS b/CREDITS
index 49cc8e5..11d6515 100644
--- a/CREDITS
+++ b/CREDITS
@@ -12,6 +12,7 @@ Bryce Walter
 Gave "OpenWave to Imail 8.12"
 
 David Alix
+Suggested transfer the ACL.
 Suggested order message transfer by uid.
 Gave "Simeon Messaging Server from MessagingDirect" and
      "Sendmail Advanced Messaging Server (from Sendmail.com)"
diff --git a/ChangeLog b/ChangeLog
index 0f97c7b..8c5e8d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,15 +1,19 @@
 
 RCS file: RCS/imapsync,v
 Working file: imapsync
-head: 1.107
+head: 1.108
 branch:
 locks: strict
 access list:
 symbolic names:
 keyword substitution: kv
-total revisions: 107;	selected revisions: 107
+total revisions: 108;	selected revisions: 108
 description:
 ----------------------------
+revision 1.108
+date: 2004/12/29 03:19:48;  author: gilles;  state: Exp;  lines: +8 -7
+--prefix2 applied before --regextrans2
+----------------------------
 revision 1.107
 date: 2004/12/28 23:24:05;  author: gilles;  state: Exp;  lines: +30 -9
 Added option --nosyncacls
diff --git a/README b/README
index 4984241..f3a803a 100644
--- a/README
+++ b/README
@@ -2,7 +2,7 @@ NAME
     imapsync - IMAP synchronization, copy or migration tool. Synchronize
     mailboxes between two imap servers. Good at IMAP migration.
 
-    $Revision: 1.107 $
+    $Revision: 1.108 $
 
 INSTALL
      imapsync works fine under any Unix OS.
@@ -239,5 +239,5 @@ AUTHOR
     teaching free open and gratis softwares. Don't hesitate to pay him for
     that services.
 
-    $Id: imapsync,v 1.107 2004/12/28 23:24:05 gilles Exp $
+    $Id: imapsync,v 1.108 2004/12/29 03:19:48 gilles Exp $
 
diff --git a/TODO b/TODO
index 2e3f7c2..e7a1dc2 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,9 @@
 TODO file for imapsync
 ----------------------
 
+Add cyrus link about INBOX. namespace
+http://asg.web.cmu.edu/cyrus/download/imapd/altnamespace.html
+
 Look at http://freshmeat.net/projects/freshmeat-submit/
 Look at comp.mail.imap http://groups.google.fr/groups?q=imapsync
 
diff --git a/VERSION b/VERSION
index 8de7690..254d74b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.107
+1.108
diff --git a/imapsync b/imapsync
index 935ae3f..1c75330 100755
--- a/imapsync
+++ b/imapsync
@@ -6,7 +6,7 @@ imapsync - IMAP synchronization, copy or migration
 tool. Synchronize mailboxes between two imap servers. Good
 at IMAP migration.
 
-$Revision: 1.107 $
+$Revision: 1.108 $
 
 =head1 INSTALL
 
@@ -281,7 +281,7 @@ Gilles LAMIRAL earn his living writing, installing,
 configuring and teaching free open and gratis
 softwares. Don't hesitate to pay him for that services.
 
-$Id: imapsync,v 1.107 2004/12/28 23:24:05 gilles Exp $
+$Id: imapsync,v 1.108 2004/12/29 03:19:48 gilles Exp $
 
 =cut
 
@@ -323,7 +323,7 @@ my(
 use vars qw ($opt_G); # missing code for this will be option.
 
 
-$rcs = ' $Id: imapsync,v 1.107 2004/12/28 23:24:05 gilles Exp $ ';
+$rcs = ' $Id: imapsync,v 1.108 2004/12/29 03:19:48 gilles Exp $ ';
 $rcs =~ m/,v (\d+\.\d+)/;
 $VERSION = ($1) ? $1 : "UNKNOWN";
 
@@ -360,8 +360,8 @@ $error=0;
 
 my $banner = join("", 
 		  '$RCSfile: imapsync,v $ ',
-		  '$Revision: 1.107 $ ',
-		  '$Date: 2004/12/28 23:24:05 $ ',
+		  '$Revision: 1.108 $ ',
+		  '$Date: 2004/12/29 03:19:48 $ ',
 		  "\n",
 		  "Mail::IMAPClient version used here is ",
 		  $VERSION_IMAPClient, " auth md5 : $md5_supported",
@@ -641,14 +641,15 @@ FOLDER: foreach my $f_fold (@f_folders) {
 	
 	$t_fold = separator_invert($f_fold,$f_sep, $t_sep);
 
+	# Adding the prefix supplied by the --prefix2 option
+	$t_fold = $prefix2 . $t_fold if ($prefix2);
+
 	# Transforming the folder name by the --regextrans2 option
 	if ($regextrans2) {
 		$debug and print "eval \$t_fold =~ $regextrans2\n";
 		eval("\$t_fold =~ $regextrans2");
 	}
 
-	# Adding the prefix supplied by the --prefix2 option
-	$t_fold = $prefix2 . $t_fold if ($prefix2);
 	print "To   Folder [$t_fold]\n";
 
 	unless ($from->select($f_fold)) {