2006-12-30 [colin] 2.6.1cvs91
authorColin Leroy <colin@colino.net>
Sat, 30 Dec 2006 14:22:02 +0000 (14:22 +0000)
committerColin Leroy <colin@colino.net>
Sat, 30 Dec 2006 14:22:02 +0000 (14:22 +0000)
* src/folder.c
* src/imap_gtk.c
* src/mh_gtk.c
Don't update filtering and account paths
when copying folders

ChangeLog
PATCHSETS
configure.ac
src/folder.c
src/imap_gtk.c
src/mh_gtk.c

index 1e73c6238170d5d6137b20d25426128be18c49d2..32ec8bd8d8d6cb51e7e98704c164d05ec4c81472 100644 (file)
--- 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
index 291da2cb02c37e11f1881c60c2803b9faf6c9fd4..d9cb43b677bc7b77f5bf11899a5b7b692f5933b2 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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
index 44bba6dd48396e8d2e9d708202523cb46a5e34dd..94439e315d520632f015c38fe9b34f2cd164803c 100644 (file)
@@ -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=
 
index d03f34b8fb7a06fdccd537f5461aeddd0b6ad12f..e650194a23695fe96acf39e06f40bba4228c78bc 100644 (file)
@@ -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);
index f711bae19c28ed7447ea253fbe39be0cf3b6eae8..c449ef1041a04db6a91c7216286adf7daf2734bc 100644 (file)
@@ -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);
index 26ffffb8a5866fb0c7b8d824d1a23b8264d6bae0..c50ad2001165068ce266e36340584dc98b90e1dd 100644 (file)
@@ -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);