[Commits] account.c 1.61.2.101 1.61.2.102 prefs_filtering.c 1.59.2.85 1.59.2.86 prefs_filtering.h 1.6.2.10 1.6.2.11
pawel at claws-mail.org
pawel at claws-mail.org
Mon Nov 21 23:14:43 CET 2011
Update of /home/claws-mail/claws/src
In directory claws-mail:/tmp/cvs-serv13347/src
Modified Files:
Tag: gtk2
account.c prefs_filtering.c prefs_filtering.h
Log Message:
2011-11-21 [pawel] 3.7.10cvs97
* src/account.c
* src/prefs_filtering.c
* src/prefs_filtering.h
Fix bug #2404 'matcherrc updates upon account renaming'
Fix bug #2406 'some part of accountrc not updated upon
account rename'
Renaming account cause changing of it's root folder prefix
from #<type>/<old_name> to #<type>/<new_name> so every
path directing to it must be altered. Fix paths in account
preferences, global processing and filtering rules, folder
processing rules upon rename
Index: prefs_filtering.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_filtering.c,v
retrieving revision 1.59.2.85
retrieving revision 1.59.2.86
diff -u -d -r1.59.2.85 -r1.59.2.86
--- prefs_filtering.c 20 Nov 2011 18:47:07 -0000 1.59.2.85
+++ prefs_filtering.c 21 Nov 2011 22:14:40 -0000 1.59.2.86
@@ -765,6 +765,83 @@
return FALSE;
}
+static void rename_path_prefix(GSList *filters, const gchar *old_prefix,
+ const gchar *new_prefix)
+{
+ GSList *action_cur, *cur;
+ gchar *new_path;
+
+ for (cur = filters; cur != NULL; cur = cur->next) {
+ FilteringProp *filtering = (FilteringProp *)cur->data;
+
+ for(action_cur = filtering->action_list ; action_cur != NULL ;
+ action_cur = action_cur->next) {
+
+ FilteringAction *action = action_cur->data;
+
+ if (action->type == MATCHACTION_SET_TAG ||
+ action->type == MATCHACTION_UNSET_TAG)
+ continue;
+ if (!action->destination)
+ continue;
+ if (!g_str_has_prefix(action->destination, old_prefix))
+ continue;
+
+ new_path = g_strconcat(new_prefix,
+ (action->destination + strlen(old_prefix)), NULL);
+ g_free(action->destination);
+ action->destination = new_path;
+ }
+ }
+}
+
+static gboolean prefs_filtering_rename_path_prefix_func(GNode *node, gpointer data)
+{
+ GSList *filters;
+ const gchar * old_prefix;
+ const gchar * new_prefix;
+ const gchar ** paths;
+ FolderItem *item;
+
+ paths = data;
+ old_prefix = paths[0];
+ new_prefix = paths[1];
+
+ cm_return_val_if_fail(old_prefix != NULL, FALSE);
+ cm_return_val_if_fail(new_prefix != NULL, FALSE);
+ cm_return_val_if_fail(node != NULL, FALSE);
+
+ item = node->data;
+ if (!item || !item->prefs)
+ return FALSE;
+ filters = item->prefs->processing;
+
+ rename_path_prefix(filters, old_prefix, new_prefix);
+
+ return FALSE;
+}
+
+void prefs_filtering_rename_path_prefix(const gchar *old_prefix,
+ const gchar *new_prefix)
+{
+ GList * cur;
+ const gchar *paths[2] = {NULL, NULL};
+ paths[0] = old_prefix;
+ paths[1] = new_prefix;
+ for (cur = folder_get_list() ; cur != NULL ; cur = g_list_next(cur)) {
+ Folder *folder;
+ folder = (Folder *) cur->data;
+ g_node_traverse(folder->node, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
+ prefs_filtering_rename_path_prefix_func, paths);
+ }
+
+ rename_path_prefix(pre_global_processing, old_prefix, new_prefix);
+ rename_path_prefix(post_global_processing, old_prefix, new_prefix);
+ rename_path_prefix(filtering_rules, old_prefix, new_prefix);
+
+ prefs_matcher_write_config();
+}
+
static void rename_tag(GSList * filters,
const gchar * old_tag, const gchar * new_tag)
{
Index: prefs_filtering.h
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_filtering.h,v
retrieving revision 1.6.2.10
retrieving revision 1.6.2.11
diff -u -d -r1.6.2.10 -r1.6.2.11
--- prefs_filtering.h 16 Feb 2011 07:16:12 -0000 1.6.2.10
+++ prefs_filtering.h 21 Nov 2011 22:14:40 -0000 1.6.2.11
@@ -47,6 +47,8 @@
void prefs_filtering_rename_path (const gchar *old_path,
const gchar *new_path);
+void prefs_filtering_rename_path_prefix (const gchar *old_prefix,
+ const gchar *new_prefix);
void prefs_filtering_delete_path (const gchar *path);
void prefs_filtering_rename_tag(const gchar *old_tag, const gchar *new_tag);
Index: account.c
===================================================================
RCS file: /home/claws-mail/claws/src/account.c,v
retrieving revision 1.61.2.101
retrieving revision 1.61.2.102
diff -u -d -r1.61.2.101 -r1.61.2.102
--- account.c 22 Oct 2011 17:09:02 -0000 1.61.2.101
+++ account.c 21 Nov 2011 22:14:40 -0000 1.61.2.102
@@ -118,6 +118,8 @@
static void account_list_view_set (void);
static void account_list_set (void);
+static void account_rename_path_prefix (const gchar *old_prefix,
+ const gchar *new_prefix);
typedef struct FindAccountInStore {
gint account_id;
@@ -442,7 +444,7 @@
void account_open(PrefsAccount *ac_prefs)
{
gboolean prev_default;
- gchar *ac_name;
+ gchar *ac_name, *old_prefix, *new_prefix;
gboolean account_dirty = FALSE;
cm_return_if_fail(ac_prefs != NULL);
@@ -458,10 +460,18 @@
account_set_as_default(ac_prefs);
if (ac_prefs->folder && strcmp2(ac_name, ac_prefs->account_name) != 0) {
+ old_prefix = folder_get_identifier(FOLDER(ac_prefs->folder));
folder_set_name(FOLDER(ac_prefs->folder),
ac_prefs->account_name);
folderview_set_all();
folder_prefs_save_config_recursive(FOLDER(ac_prefs->folder));
+ new_prefix = folder_get_identifier(FOLDER(ac_prefs->folder));
+
+ account_rename_path_prefix(old_prefix, new_prefix);
+ prefs_filtering_rename_path_prefix(old_prefix, new_prefix);
+
+ g_free(old_prefix);
+ g_free(new_prefix);
}
account_write_config_all();
@@ -560,6 +570,32 @@
#undef CHECK_CHANGE_FOLDER
+#define CHANGE_FOLDER_PREFIX(folder) { \
+ if (folder && g_str_has_prefix(folder, old_prefix)) { \
+ gchar *new_path = g_strconcat(new_prefix, \
+ (folder + strlen(old_prefix)), NULL); \
+ g_free(folder); \
+ folder = new_path; \
+ } \
+}
+
+static void account_rename_path_prefix(const gchar *old_prefix,
+ const gchar *new_prefix)
+{
+ GList *cur = account_list;
+ for (; cur != NULL; cur = g_list_next(cur)) {
+ PrefsAccount *ap = (PrefsAccount *)cur->data;
+ CHANGE_FOLDER_PREFIX(ap->inbox);
+ CHANGE_FOLDER_PREFIX(ap->local_inbox);
+ CHANGE_FOLDER_PREFIX(ap->queue_folder);
+ CHANGE_FOLDER_PREFIX(ap->sent_folder);
+ CHANGE_FOLDER_PREFIX(ap->draft_folder);
+ CHANGE_FOLDER_PREFIX(ap->trash_folder);
+ }
+}
+
+#undef CHANGE_FOLDER_PREFIX
+
FolderItem *account_get_special_folder(PrefsAccount *ac_prefs,
SpecialFolderItemType type)
{
More information about the Commits
mailing list