[Commits] [SCM] claws branch, master, updated. 4.3.0-39-g4951de55f

[paul at claws-mail.org]

The branch, master has been updated
       via  4951de55f61c5c30a92639661422757fbedd4445 (commit)
      from  b1798e12ee93466af0a75d8ef5896709668d7a01 (commit)

Summary of changes:
 src/foldersel.c | 10 ++++++----
 src/foldersel.h |  5 +++--
 2 files changed, 9 insertions(+), 6 deletions(-)


- Log -----------------------------------------------------------------
commit 4951de55f61c5c30a92639661422757fbedd4445
Author: Paul <paul at claws-mail.org>
Date:   Thu Sep 26 17:17:51 2024 +0100

    if possible, don't silently fail to save a sent msg

diff --git a/src/foldersel.c b/src/foldersel.c
index fab33691a..051bf32da 100644
--- a/src/foldersel.c
+++ b/src/foldersel.c
@@ -85,7 +85,8 @@ static GtkTreeStore *tree_store;
 static gboolean cancelled;
 static gboolean finished;
 
-static void foldersel_create		(const gchar *title);
+static void foldersel_create		(const gchar *title,
+					 FolderSelectionType type);
 static void foldersel_init		(void);
 
 static void foldersel_append_item	(GtkTreeStore	*store,
@@ -139,7 +140,7 @@ FolderItem *foldersel_folder_sel(Folder *cur_folder, FolderSelectionType type,
 	root_selectable = can_sel_mailbox;
 
 	if (!window) {
-		foldersel_create(title);
+		foldersel_create(title, type);
 		foldersel_init();
 	}
 
@@ -237,7 +238,7 @@ static void foldersel_size_allocate_cb(GtkWidget *widget,
 		&prefs_common.folderselwin_width, &prefs_common.folderselwin_height);
 }
 
-static void foldersel_create(const gchar *title)
+static void foldersel_create(const gchar *title, FolderSelectionType type)
 {
 	GtkWidget *vbox;
 	GtkWidget *scrolledwin;
@@ -344,7 +345,8 @@ static void foldersel_create(const gchar *title)
 
 	gtkut_stock_button_set_create(&confirm_area,
 				      &new_button,    NULL, _("_New"),
-				      &cancel_button, NULL, _("_Cancel"),
+				      &cancel_button, NULL, (type == FOLDER_SEL_SAVE?
+							    _("Don't save") : _("_Cancel")),
 				      &ok_button,     NULL, _("_OK"));
 
 	gtk_box_pack_end(GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
diff --git a/src/foldersel.h b/src/foldersel.h
index bfdbb8e08..32042dea8 100644
--- a/src/foldersel.h
+++ b/src/foldersel.h
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2024 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,7 +29,8 @@ typedef enum
 {
 	FOLDER_SEL_ALL,
 	FOLDER_SEL_MOVE,
-	FOLDER_SEL_COPY
+	FOLDER_SEL_COPY,
+	FOLDER_SEL_SAVE
 } FolderSelectionType;
 
 FolderItem *foldersel_folder_sel(Folder			*cur_folder,

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


hooks/post-receive
-- 
Claws Mail