[Commits] [SCM] claws branch, gtk3, updated. 3.16.0-456-g71b0a50
ticho at claws-mail.org
ticho at claws-mail.org
Sat Nov 3 19:36:37 CET 2018
The branch, gtk3 has been updated
via 71b0a50c5040f68443e9973ef99e89d7686729dd (commit)
via 826a31268e607d1edc365bfa51e000ce93fce40a (commit)
via 95f481ee3a921b159ffd997c419d2928e4ff62e8 (commit)
via f3144f7517e6e04509284cd255cc84f5f02f298a (commit)
from 10993cfa64528fe3cdadf4131c1a0efaca40060e (commit)
Summary of changes:
src/common/file-utils.c | 1 +
src/compose.c | 25 ++++++++++++++++---------
src/summaryview.c | 2 +-
3 files changed, 18 insertions(+), 10 deletions(-)
- Log -----------------------------------------------------------------
commit 71b0a50c5040f68443e9973ef99e89d7686729dd
Author: User Corn <c0rn at o2.pl>
Date: Fri Nov 2 00:18:48 2018 +0100
Fix build on FreeBSD, sys/wait.h is needed for WEXITSTATUS macro
diff --git a/src/common/file-utils.c b/src/common/file-utils.c
index 48d29de..95330de 100644
--- a/src/common/file-utils.c
+++ b/src/common/file-utils.c
@@ -21,6 +21,7 @@
#include "claws-features.h"
#endif
+#include <sys/wait.h>
#include <errno.h>
#include <stdio.h>
#include <unistd.h>
commit 826a31268e607d1edc365bfa51e000ce93fce40a
Author: Paul <paul at claws-mail.org>
Date: Mon Oct 29 17:31:51 2018 +0000
fix annoyance where your current reading is disturbed when a new msg is filtered into the current folder
diff --git a/src/summaryview.c b/src/summaryview.c
index 78ed887..82536f7 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -1477,7 +1477,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
OPEN_SELECTED_ON_SEARCH_RESULTS);
else
summary_select_by_msgnum(summaryview, selected_msgnum,
- OPEN_SELECTED_ON_FOLDER_OPEN);
+ FALSE);
summary_lock(summaryview);
if (!summaryview->selected) {
commit 95f481ee3a921b159ffd997c419d2928e4ff62e8
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 7537a73..da1a273 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -7537,7 +7537,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 f3144f7517e6e04509284cd255cc84f5f02f298a
Author: Paul <paul at claws-mail.org>
Date: Mon Oct 29 09:01:16 2018 +0000
revert 874a232f1, it breaks stuff
diff --git a/src/compose.c b/src/compose.c
index 441c4b8..7537a73 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -925,13 +925,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)
@@ -1196,6 +1193,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);
@@ -1579,6 +1577,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);
@@ -1907,6 +1906,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);
@@ -2399,6 +2399,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);
@@ -2543,6 +2544,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
More information about the Commits
mailing list