[Commits] [SCM] claws branch, gtk3tree, updated. 4.0.0-389-g67e762199

[thorsten at claws-mail.org]

The branch, gtk3tree has been updated
       via  67e7621999f23a2eb5b0011195b1ec8caef369d8 (commit)
      from  8309d426609450425565c8e6c9d52b6bd4846ab6 (commit)

Summary of changes:
 src/folderview.c | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)


- Log -----------------------------------------------------------------
commit 67e7621999f23a2eb5b0011195b1ec8caef369d8
Author: Thorsten Maerz <info at netztorte.de>
Date:   Wed Oct 13 12:15:46 2021 +0200

    Completed last merge 8309d426609450425565c8e6c9d52b6bd4846ab6
    
    Added missing chunks from last merge
    (caused by conflicts)
    
    Fix CID 1491360: dereference null return value.
    4 days ago c6fa3ed5efcf7b738f2141539be3285c40afe964
    -> Applied
    
    Fix CID 1491194: resource leak.
    8 days ago 3665d84a62c167054e76833a1fa2874a48823554
    -> Applied
    
    Normalize g_warning's: no capitalization, no trailing...
    2021-09-03 ed74a4678f288382bf93c6dbe7cda08bcdacf40c
    -> Unaffected
    
    Add a global option to allow executing per-folder proce...
    2021-09-01 e7436fb6938e61b5c62c2cd296222baaa3b78a0c
    -> Added missing chunk
    
    Add a per-folder option so that a folder can be skipped...
    2021-08-31 76e9a5af67914f92ec26c6223d3b2a5413a97fad
    -> Already merged

diff --git a/src/folderview.c b/src/folderview.c
index 78794f7cd..c953ced7b 100644
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -2401,7 +2401,6 @@ static void folderview_drag_data_get(GtkWidget        *widget,
 	GtkTreeModel *model;
 	GtkTreeIter iter;
 	FolderItem *item;
-	gchar *source = NULL;
 	if (info == TARGET_DUMMY) {
 		if (!folderview->open_path)
 			return;
@@ -2413,7 +2412,10 @@ static void folderview_drag_data_get(GtkWidget        *widget,
 		gtk_tree_model_get_iter(model, &iter, folderview->open_path);
 		gtk_tree_model_get(model, &iter, F_COL_FOLDERITEM, &item, -1);
 		if (item) {
-			source = g_strdup_printf ("FROM_OTHER_FOLDER%s", folder_item_get_identifier(item));
+			gchar *source = NULL;
+			gchar *name = folder_item_get_identifier(item);
+			source = g_strdup_printf ("FROM_OTHER_FOLDER%s", name);
+			g_free(name);
 			gtk_selection_data_set(selection_data,
 					       gtk_selection_data_get_target(selection_data), 8,
 					       source, strlen(source));
@@ -2644,7 +2646,7 @@ static void folderview_drag_received_cb(GtkWidget        *widget,
 			/* comes from summaryview */
 			src_item = folderview->summaryview->folder_item;
 
-			if (item->no_select) {
+			if (item && item->no_select) {
 				alertpanel_error(_("The destination folder can only be used to "
 						   "store subfolders."));
 				return;
@@ -3403,13 +3405,19 @@ static void mark_all_read_unread_handler(GtkAction *action, gpointer data,
 	if (read) {
 		if (recursive)
 			folderutils_mark_all_read_recursive(item, TRUE);
-		else
+		else {
+			if (prefs_common.run_processingrules_before_mark_all)
+				folderview_run_processing(item);
 			folderutils_mark_all_read(item, TRUE);
+		}
 	} else {
 		if (recursive)
 			folderutils_mark_all_read_recursive(item, FALSE);
-		else
+		else {
 			folderutils_mark_all_read(item, FALSE);
+			if (prefs_common.run_processingrules_before_mark_all)
+				folderview_run_processing(item);
+		}
 	}
 	if (folderview->summaryview->folder_item != item && !recursive)
 		summary_unlock(folderview->summaryview);

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail