[Commits] [SCM] claws branch, master, updated. 3.17.0-141-gd2bdb12

[claws at claws-mail.org]

The branch, master has been updated
       via  d2bdb12e8f5093cb1e55958d24f34331a5fdb47e (commit)
       via  87b3f3f3937db445300f08cffcc3b8392db5f827 (commit)
      from  45500aa4e0934a3a80bd2f0cdcdf78c9c23f9fcf (commit)

Summary of changes:
 src/compose.c |   25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)


- Log -----------------------------------------------------------------
commit d2bdb12e8f5093cb1e55958d24f34331a5fdb47e
Author: Paul <paul at claws-mail.org>
Date:   Mon Oct 29 09:03:04 2018 +0000

    fix for smtp-only accounts when global pref for save sent msg is set

diff --git a/src/compose.c b/src/compose.c
index 487ec1c..6de8169 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -7535,7 +7535,7 @@ static GtkWidget *compose_create_others(Compose *compose)
 	g_signal_connect_after(G_OBJECT(savemsg_combo), "grab_focus",
 			 G_CALLBACK(compose_grab_focus_cb), compose);
 	if (account_get_special_folder(compose->account, F_OUTBOX)) {
-		if (compose->account->set_sent_folder)
+		if (compose->account->set_sent_folder || prefs_common.savemsg)
 			gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(savemsg_checkbtn), TRUE);
 		else
 			gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(savemsg_checkbtn), FALSE);

commit 87b3f3f3937db445300f08cffcc3b8392db5f827
Author: Paul <paul at claws-mail.org>
Date:   Mon Oct 29 09:01:16 2018 +0000

    revert g45500aa, it breaks stuff

diff --git a/src/compose.c b/src/compose.c
index 786ace4..487ec1c 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -940,13 +940,10 @@ static void compose_set_save_to(Compose *compose, const gchar *folderidentifier)
 	}
 
 	entry = GTK_EDITABLE(gtk_bin_get_child(GTK_BIN(compose->savemsg_combo)));
-	if (folderidentifier) {
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn), TRUE);
+	if (folderidentifier)
 		gtk_entry_set_text(GTK_ENTRY(entry), folderidentifier);
-	} else {
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn), FALSE);
+	else
 		gtk_entry_set_text(GTK_ENTRY(entry), "");
-	}
 }
 
 static gchar *compose_get_save_to(Compose *compose)
@@ -1211,6 +1208,7 @@ Compose *compose_generic_new(PrefsAccount *account, const gchar *mailto, FolderI
 	if (item && item->prefs && item->prefs->save_copy_to_folder) {
 		gchar *folderidentifier;
 
+    		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn), TRUE);
 		gtk_widget_set_sensitive(GTK_WIDGET(compose->savemsg_combo), TRUE);
 		folderidentifier = folder_item_get_identifier(item);
 		compose_set_save_to(compose, folderidentifier);
@@ -1592,6 +1590,7 @@ static Compose *compose_generic_reply(MsgInfo *msginfo,
 	if (msginfo->folder && msginfo->folder->prefs && msginfo->folder->prefs->save_copy_to_folder) {
 		gchar *folderidentifier;
 
+    		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn), TRUE);
 		gtk_widget_set_sensitive(GTK_WIDGET(compose->savemsg_combo), TRUE);
 		folderidentifier = folder_item_get_identifier(msginfo->folder);
 		compose_set_save_to(compose, folderidentifier);
@@ -1916,6 +1915,7 @@ Compose *compose_forward(PrefsAccount *account, MsgInfo *msginfo,
 	if (msginfo->folder && msginfo->folder->prefs && msginfo->folder->prefs->save_copy_to_folder) {
 		gchar *folderidentifier;
 
+    		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn), TRUE);
 		gtk_widget_set_sensitive(GTK_WIDGET(compose->savemsg_combo), TRUE);
 		folderidentifier = folder_item_get_identifier(msginfo->folder);
 		compose_set_save_to(compose, folderidentifier);
@@ -2406,6 +2406,7 @@ Compose *compose_reedit(MsgInfo *msginfo, gboolean batch)
 
 		/* Set message save folder */
 		if (!procheader_get_header_from_msginfo(msginfo, &queueheader_buf, "SCF:")) {
+			gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn), TRUE);
 			gtk_widget_set_sensitive(GTK_WIDGET(compose->savemsg_combo), TRUE);
 			compose_set_save_to(compose, &queueheader_buf[4]);
 			g_free(queueheader_buf);
@@ -2547,6 +2548,7 @@ Compose *compose_redirect(PrefsAccount *account, MsgInfo *msginfo,
 	if (item && item->prefs && item->prefs->save_copy_to_folder) {
 		gchar *folderidentifier;
 
+    		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn), TRUE);
 		gtk_widget_set_sensitive(GTK_WIDGET(compose->savemsg_combo), TRUE);
 		folderidentifier = folder_item_get_identifier(item);
 		compose_set_save_to(compose, folderidentifier);
@@ -10071,7 +10073,6 @@ static void account_activated(GtkComboBox *optmenu, gpointer data)
 	GtkTreeIter iter;
 	GSList *list, *saved_list = NULL;
 	HeaderEntryState *state;
-	FolderItem *item;
 
 	/* Get ID of active account in the combo box */
 	menu = gtk_combo_box_get_model(optmenu);
@@ -10138,13 +10139,19 @@ static void account_activated(GtkComboBox *optmenu, gpointer data)
 	/* Set message save folder */
 	compose_set_save_to(compose, NULL);
 	if (compose->folder && compose->folder->prefs && compose->folder->prefs->save_copy_to_folder) {
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn), TRUE);
 		gtk_widget_set_sensitive(GTK_WIDGET(compose->savemsg_combo), TRUE);
 		folderidentifier = folder_item_get_identifier(compose->folder);
 		compose_set_save_to(compose, folderidentifier);
 		g_free(folderidentifier);
-	} else if ((item = account_get_special_folder(compose->account, F_OUTBOX)) != NULL) {
+	} else if (account_get_special_folder(compose->account, F_OUTBOX)) {
+		if (compose->account->set_sent_folder)
+			gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn), TRUE);
+		else
+			gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn), FALSE);
 		gtk_widget_set_sensitive(GTK_WIDGET(compose->savemsg_combo), TRUE);
-		folderidentifier = folder_item_get_identifier(item);
+		folderidentifier = folder_item_get_identifier(account_get_special_folder
+				  (compose->account, F_OUTBOX));
 		compose_set_save_to(compose, folderidentifier);
 		g_free(folderidentifier);
 	}

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


hooks/post-receive
-- 
Claws Mail