From 54c8b6dba127d4e44955b96045ca001cf19699cb Mon Sep 17 00:00:00 2001
From: =?utf8?q?Ho=C3=A0=20Vi=C3=AAt=20Dinh?= <dinh.viet.hoa@free.fr>
Date: Sun, 27 May 2001 23:40:29 +0000
Subject: [PATCH] fixes for mbox / changes matcher dialog

---
 ChangeLog.claws     |  5 ++++
 src/folderview.c    | 63 +++++++++++++++++++++++++++++++++++++++++++--
 src/prefs_matcher.c |  2 +-
 src/summaryview.c   |  5 ++++
 4 files changed, 72 insertions(+), 3 deletions(-)

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 4031d7892..37f80ac51 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -36,6 +36,9 @@
 	* src/prefs_filtering.c
 		removed some warnings
 
+	* src/prefs_matcher.c
+		default boolean operation is AND
+
 	* src/procheader.c
 		handling flags for mbox format
 		handling of "From " header
@@ -47,6 +50,8 @@
 
 	* src/summaryview.c
 		handling flags for mbox format
+		disable the MSG_DELETED flags when messages
+		are deleted in mbox format
 
 	* src/textview.c
 		"From " headers display fixed.
diff --git a/src/folderview.c b/src/folderview.c
index 8ead09c90..8d7d7f58d 100644
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -156,6 +156,9 @@ static void folderview_new_mbox_folder_cb(FolderView *folderview,
 static void folderview_rename_folder_cb	(FolderView	*folderview,
 					 guint		 action,
 					 GtkWidget	*widget);
+static void folderview_rename_mbox_folder_cb(FolderView *folderview,
+					     guint action,
+					     GtkWidget *widget);
 static void folderview_delete_folder_cb	(FolderView	*folderview,
 					 guint		 action,
 					 GtkWidget	*widget);
@@ -205,7 +208,7 @@ static void folderview_drag_received_cb  (GtkWidget        *widget,
 static GtkItemFactoryEntry folderview_mbox_popup_entries[] =
 {
 	{N_("/Create _new folder..."),	NULL, folderview_new_mbox_folder_cb,    0, NULL},
-	{N_("/_Rename folder..."),	NULL, folderview_rename_folder_cb, 0, NULL},
+	{N_("/_Rename folder..."),	NULL, folderview_rename_mbox_folder_cb, 0, NULL},
 	{N_("/_Delete folder"),		NULL, folderview_delete_folder_cb, 0, NULL},
 	{N_("/---"),			NULL, NULL, 0, "<Separator>"},
 	{N_("/Remove _mailbox"),	NULL, folderview_remove_mailbox_cb, 0, NULL},
@@ -1026,8 +1029,9 @@ void folderview_rename_folder(FolderView *folderview)
 	if (item->stype != F_NORMAL) return;
 
 	switch (item->folder->type) {
-	case F_MH:
 	case F_MBOX:
+		folderview_rename_mbox_folder_cb(folderview, 0, NULL);
+	case F_MH:
 	case F_MAILDIR:
 		folderview_rename_folder_cb(folderview, 0, NULL);
 		break;
@@ -1508,6 +1512,61 @@ static void folderview_rename_folder_cb(FolderView *folderview, guint action,
 	folder_write_list();
 }
 
+static void folderview_rename_mbox_folder_cb(FolderView *folderview,
+					     guint action,
+					     GtkWidget *widget)
+{
+	GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+	FolderItem *item;
+	gchar *new_folder;
+	gchar *message;
+
+	if (!folderview->selected) return;
+
+	item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
+	g_return_if_fail(item != NULL);
+	g_return_if_fail(item->path != NULL);
+	g_return_if_fail(item->folder != NULL);
+
+	message = g_strdup_printf(_("Input new name for `%s':"),
+				  g_basename(item->path));
+	new_folder = input_dialog(_("Rename folder"), message,
+				  g_basename(item->path));
+	g_free(message);
+	if (!new_folder) return;
+
+	if (folderview_find_by_name
+		(ctree, GTK_CTREE_ROW(folderview->selected)->parent,
+		 new_folder)) {
+		alertpanel_error(_("The folder `%s' already exists."),
+				 new_folder);
+		g_free(new_folder);
+		return;
+	}
+
+	if (item->folder->rename_folder(item->folder, item, new_folder) < 0) {
+		g_free(new_folder);
+		return;
+	}
+	g_free(new_folder);
+
+	gtk_clist_freeze(GTK_CLIST(ctree));
+
+	folderview_update_node(folderview, folderview->selected);
+	folderview_sort_folders(folderview,
+				GTK_CTREE_ROW(folderview->selected)->parent,
+				item->folder);
+	if (folderview->opened == folderview->selected) {
+		if (!GTK_CTREE_ROW(folderview->opened)->children)
+			gtk_ctree_expand(ctree, folderview->opened);
+		summary_show(folderview->summaryview, item, FALSE);
+	}
+
+	gtk_clist_thaw(GTK_CLIST(ctree));
+
+	folder_write_list();
+}
+
 static void folderview_delete_folder_cb(FolderView *folderview, guint action,
 					GtkWidget *widget)
 {
diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c
index b0efe4f30..3f96e612d 100644
--- a/src/prefs_matcher.c
+++ b/src/prefs_matcher.c
@@ -624,7 +624,7 @@ static void prefs_matcher_set_dialog(MatcherList * matchers)
 {
 	GtkCList *clist = GTK_CLIST(matcher.cond_clist);
 	GSList * cur;
-	gboolean bool_op = 0;
+	gboolean bool_op = 1;
 
 	gtk_clist_freeze(clist);
 	gtk_clist_clear(clist);
diff --git a/src/summaryview.c b/src/summaryview.c
index 69d2ecd70..4b543cccd 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -2505,6 +2505,11 @@ static void summary_execute_delete(SummaryView *summaryview)
 
 	if (!summaryview->mlist) return;
 
+	for(cur = summaryview->mlist ; cur != NULL ; cur = cur->next) {
+		MsgInfo * msginfo = cur->data;
+		MSG_UNSET_FLAGS(msginfo->flags, MSG_DELETED);
+	}
+
 	folder_item_move_msgs_with_dest(trash, summaryview->mlist);
 
 	for (cur = summaryview->mlist; cur != NULL; cur = cur->next)
-- 
2.25.1