gfgit/claws-mail
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

2006-12-30 [colin] 2.6.1cvs91

Browse source 
* src/folder.c
	* src/imap_gtk.c
	* src/mh_gtk.c
		Don't update filtering and account paths
		when copying folders
This commit is contained in:
Colin Leroy 2006-12-30 14:22:02 +00:00
parent fd83f0e8c9
commit 2fcd20dd60
6 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -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

1
PATCHSETS
View file

@ -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

2
configure.ac
View 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=

10
src/folder.c
View 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);

2
src/imap_gtk.c
View 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);

2
src/mh_gtk.c
View 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);