From: Colin Leroy <colin@colino.net>
Date: Sat, 30 Dec 2006 14:22:02 +0000 (+0000)
Subject: 2006-12-30 [colin]	2.6.1cvs91
X-Git-Tag: rel_2_7_0~30
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=2fcd20dd60e91f508d3816ce4eb9f2ceaba50fb0

2006-12-30 [colin]	2.6.1cvs91

	* src/folder.c
	* src/imap_gtk.c
	* src/mh_gtk.c
		Don't update filtering and account paths
		when copying folders
---

diff --git a/ChangeLog b/ChangeLog
index 1e73c6238..32ec8bd8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-12-30 [colin]	2.6.1cvs91
+
+	* src/folder.c
+	* src/imap_gtk.c
+	* src/mh_gtk.c
+		Don't update filtering and account paths 
+		when copying folders
+
 2006-12-30 [colin]	2.6.1cvs90
 
 	* src/prefs_compose_writing.c
diff --git a/PATCHSETS b/PATCHSETS
index 291da2cb0..d9cb43b67 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2198,3 +2198,4 @@
 ( cvs diff -u -r 1.52.2.31 -r 1.52.2.32 src/prefs_folder_item.c;  ) > 2.6.1cvs88.patchset
 ( cvs diff -u -r 1.1.2.30 -r 1.1.2.31 src/prefs_summaries.c;  ) > 2.6.1cvs89.patchset
 ( cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/prefs_compose_writing.c;  cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/prefs_quote.c;  cvs diff -u -r 1.12.2.37 -r 1.12.2.38 src/prefs_template.c;  ) > 2.6.1cvs90.patchset
+( cvs diff -u -r 1.213.2.128 -r 1.213.2.129 src/folder.c;  cvs diff -u -r 1.1.2.34 -r 1.1.2.35 src/imap_gtk.c;  cvs diff -u -r 1.2.2.24 -r 1.2.2.25 src/mh_gtk.c;  ) > 2.6.1cvs91.patchset
diff --git a/configure.ac b/configure.ac
index 44bba6dd4..94439e315 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=90
+EXTRA_VERSION=91
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/folder.c b/src/folder.c
index d03f34b8f..e650194a2 100644
--- a/src/folder.c
+++ b/src/folder.c
@@ -2846,16 +2846,18 @@ static FolderItem *folder_item_move_recursive(FolderItem *src, FolderItem *dest,
 	}
 	old_id = folder_item_get_identifier(src);
 	new_id = folder_item_get_identifier(new_item);
-	debug_print("updating rules : %s => %s\n", old_id, new_id);
 
 	/* if src supports removing, otherwise only copy folder */
 	if (src->folder->klass->remove_folder != NULL && !copy)	
 		src->folder->klass->remove_folder(src->folder, src);
 	folder_write_list();
 
-	if (old_id != NULL && new_id != NULL) {
-		prefs_filtering_rename_path(old_id, new_id);
-		account_rename_path(old_id, new_id);
+	if (!copy) {
+		debug_print("updating rules : %s => %s\n", old_id, new_id);
+		if (old_id != NULL && new_id != NULL) {
+			prefs_filtering_rename_path(old_id, new_id);
+			account_rename_path(old_id, new_id);
+		}
 	}
 	g_free(old_id);
 	g_free(new_id);
diff --git a/src/imap_gtk.c b/src/imap_gtk.c
index f711bae19..c449ef104 100644
--- a/src/imap_gtk.c
+++ b/src/imap_gtk.c
@@ -232,8 +232,6 @@ static void rename_folder_cb(FolderView *folderview, guint action,
 		return;
 	}
 
-	/* if (FOLDER_TYPE(item->folder) == F_MH)
-		prefs_filtering_rename_path(old_path, item->path); */
 	new_id = folder_item_get_identifier(item);
 	prefs_filtering_rename_path(old_id, new_id);
 	account_rename_path(old_id, new_id);
diff --git a/src/mh_gtk.c b/src/mh_gtk.c
index 26ffffb8a..c50ad2001 100644
--- a/src/mh_gtk.c
+++ b/src/mh_gtk.c
@@ -261,8 +261,6 @@ static void rename_folder_cb(FolderView *folderview, guint action,
 		return;
 	}
 
-	/* if (FOLDER_TYPE(item->folder) == F_MH)
-		prefs_filtering_rename_path(old_path, item->path); */
 	new_id = folder_item_get_identifier(item);
 	prefs_filtering_rename_path(old_id, new_id);
 	account_rename_path(old_id, new_id);