fixed a bug in syncing folder path.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@388 ee746299-78ed-0310-b773-934348b2243d

2 files changed, 15 insertions, 34 deletions

diff --git a/src/filter.c b/src/filter.c
index 217c55da..b17134fa 100644
--- a/src/filter.c
+++ b/src/filter.c
@@ -1092,6 +1092,8 @@ void filter_rule_rename_dest_path(FilterRule *rule, const gchar *old_path,
 	gchar *dest_path;
 	gint oldpathlen;
 
+	oldpathlen = strlen(old_path);
+
 	for (cur = rule->action_list; cur != NULL; cur = cur->next) {
 		action = (FilterAction *)cur->data;
 
@@ -1099,10 +1101,11 @@ void filter_rule_rename_dest_path(FilterRule *rule, const gchar *old_path,
 		    action->type != FLT_ACTION_COPY)
 			continue;
 
-		oldpathlen = strlen(old_path);
 		if (action->str_value &&
 		    !strncmp(old_path, action->str_value, oldpathlen)) {
 			base = action->str_value + oldpathlen;
+			if (*base != G_DIR_SEPARATOR && *base != '\0')
+				continue;
 			while (*base == G_DIR_SEPARATOR) base++;
 			if (*base == '\0')
 				dest_path = g_strdup(new_path);
@@ -1121,6 +1124,9 @@ void filter_rule_delete_action_by_dest_path(FilterRule *rule, const gchar *path)
 	FilterAction *action;
 	GSList *cur;
 	GSList *next;
+	gint pathlen;
+
+	pathlen = strlen(path);
 
 	for (cur = rule->action_list; cur != NULL; cur = next) {
 		action = (FilterAction *)cur->data;
@@ -1131,7 +1137,9 @@ void filter_rule_delete_action_by_dest_path(FilterRule *rule, const gchar *path)
 			continue;
 
 		if (action->str_value &&
-		    !strncmp(path, action->str_value, strlen(path))) {
+		    !strncmp(path, action->str_value, pathlen) &&
+		    (action->str_value[pathlen] == G_DIR_SEPARATOR ||
+		     action->str_value[pathlen] == '\0')) {
 			rule->action_list = g_slist_remove
 				(rule->action_list, action);
 			filter_action_free(action);
diff --git a/src/folderview.c b/src/folderview.c
index f5488fc8..27020fae 100644
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -1298,19 +1298,10 @@ void folderview_new_folder(FolderView *folderview)
 
 	g_return_if_fail(item->folder != NULL);
 
-	switch (FOLDER_TYPE(item->folder)) {
-	case F_MH:
-	case F_MBOX:
-	case F_MAILDIR:
-	case F_IMAP:
+	if (item->folder->klass->create_folder)
 		folderview_new_folder_cb(folderview, 0, NULL);
-		break;
-	case F_NEWS:
+	else if (FOLDER_TYPE(item->folder) == F_NEWS)
 		folderview_new_news_group_cb(folderview, 0, NULL);
-		break;
-	default:
-		break;
-	}
 }
 
 void folderview_rename_folder(FolderView *folderview)
@@ -1326,17 +1317,8 @@ void folderview_rename_folder(FolderView *folderview)
 	if (!item->path) return;
 	if (item->stype != F_NORMAL) return;
 
-	switch (FOLDER_TYPE(item->folder)) {
-	case F_MH:
-	case F_MBOX:
-	case F_MAILDIR:
-	case F_IMAP:
+	if (item->folder->klass->rename_folder)
 		folderview_rename_folder_cb(folderview, 0, NULL);
-		break;
-	case F_NEWS:
-	default:
-		break;
-	}
 }
 
 void folderview_delete_folder(FolderView *folderview)
@@ -1352,19 +1334,10 @@ void folderview_delete_folder(FolderView *folderview)
 	if (!item->path) return;
 	if (item->stype != F_NORMAL) return;
 
-	switch (FOLDER_TYPE(item->folder)) {
-	case F_MH:
-	case F_MBOX:
-	case F_MAILDIR:
-	case F_IMAP:
+	if (item->folder->klass->remove_folder)
 		folderview_delete_folder_cb(folderview, 0, NULL);
-		break;
-	case F_NEWS:
+	else if (FOLDER_TYPE(item->folder) == F_NEWS)
 		folderview_rm_news_group_cb(folderview, 0, NULL);
-		break;
-	default:
-		break;
-	}
 }
 
 void folderview_check_new_selected(FolderView *folderview)