[Commits] [SCM] claws branch, gtk3, updated. 4.0.0-122-g1e9ab88e5

[wwp at claws-mail.org]

The branch, gtk3 has been updated
       via  1e9ab88e5a154ecb2d9f5f1ae4efdabe35776e3e (commit)
      from  1be840cc970cc25d56c39d3605daac14e95f08ca (commit)

Summary of changes:
 src/compose.c                         |  5 -----
 src/plugins/rssyl/rssyl_prefs.c       | 13 -------------
 src/plugins/rssyl/rssyl_prefs.h       |  2 --
 src/plugins/rssyl/rssyl_update_feed.c |  9 ++-------
 src/procmsg.c                         |  1 -
 5 files changed, 2 insertions(+), 28 deletions(-)


- Log -----------------------------------------------------------------
commit 1e9ab88e5a154ecb2d9f5f1ae4efdabe35776e3e
Author: wwp <subscript at free.fr>
Date:   Sun Sep 5 09:40:11 2021 +0200

    Revert accidentally commited changes.

diff --git a/src/compose.c b/src/compose.c
index 5794a8a8d..1388ca908 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -1754,11 +1754,6 @@ Compose *compose_forward(PrefsAccount *account, MsgInfo *msginfo,
 	if (!compose->fwdinfo)
 		compose->fwdinfo = procmsg_msginfo_copy(msginfo);
 
-	if (compose->deferred_destroy) {
-		compose_destroy(compose);
-		return NULL;
-	}
-
 	compose_extract_original_charset(compose);
 
 	if (msginfo->subject && *msginfo->subject) {
diff --git a/src/plugins/rssyl/rssyl_prefs.c b/src/plugins/rssyl/rssyl_prefs.c
index e25dba014..adf7e56b4 100644
--- a/src/plugins/rssyl/rssyl_prefs.c
+++ b/src/plugins/rssyl/rssyl_prefs.c
@@ -55,8 +55,6 @@ static PrefParam param[] = {
 		P_BOOL,	NULL, NULL, NULL },
 	{ "refresh_enabled", "TRUE", &rssyl_prefs.refresh_enabled,
 		P_BOOL,	NULL, NULL, NULL },
-	{ "refresh_all_skips", "FALSE", &rssyl_prefs.refresh_all_skips,
-		P_BOOL,	NULL, NULL, NULL },
 	{ "cookies_path", "", &rssyl_prefs.cookies_path,
 		P_STRING, NULL, NULL, NULL },
 	{ "ssl_verify_peer", "TRUE", &rssyl_prefs.ssl_verify_peer,
@@ -131,7 +129,6 @@ static void create_rssyl_prefs_page(PrefsPage *page,
 	GtkWidget *refresh, *refresh_enabled, *refresh_hbox;
 	GtkWidget *label;
 	GtkWidget *refresh_on_startup;
-	GtkWidget *refresh_all_skips;
 	GtkAdjustment *refresh_adj;
 	GtkWidget *cookies_path, *cookies_btn, *cookies_hbox;
 	GtkWidget *ssl_verify_peer;
@@ -166,13 +163,6 @@ static void create_rssyl_prefs_page(PrefsPage *page,
 			rssyl_prefs.refresh_on_startup);
 	gtk_box_pack_start(GTK_BOX(vbox1), refresh_on_startup, FALSE, FALSE, 0);
 
-	/* Whether refresh-all will skip feeds that are not programmed to be periodically refreshed or not */
-	refresh_all_skips = gtk_check_button_new_with_label(
-			_("Refresh all skips feeds programmed to be refreshed manually"));
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(refresh_all_skips),
-			rssyl_prefs.refresh_all_skips);
-	gtk_box_pack_start(GTK_BOX(vbox1), refresh_all_skips, FALSE, FALSE, 0);
-
 	vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
 
 	/* Whether to verify SSL peer certificate */
@@ -217,7 +207,6 @@ static void create_rssyl_prefs_page(PrefsPage *page,
 	prefs_page->refresh_enabled = refresh_enabled;
 	prefs_page->refresh = refresh;
 	prefs_page->refresh_on_startup = refresh_on_startup;
-	prefs_page->refresh_all_skips = refresh_all_skips;
 	prefs_page->cookies_path = cookies_path;
 	prefs_page->ssl_verify_peer = ssl_verify_peer;
 }
@@ -241,8 +230,6 @@ static void save_rssyl_prefs(PrefsPage *page)
 			GTK_SPIN_BUTTON(prefs_page->refresh));
 	rssyl_prefs.refresh_on_startup = gtk_toggle_button_get_active(
 			GTK_TOGGLE_BUTTON(prefs_page->refresh_on_startup));
-	rssyl_prefs.refresh_all_skips = gtk_toggle_button_get_active(
-			GTK_TOGGLE_BUTTON(prefs_page->refresh_all_skips));
 	g_free(rssyl_prefs.cookies_path);
 	rssyl_prefs.cookies_path = g_strdup(gtk_entry_get_text(
 				GTK_ENTRY(prefs_page->cookies_path)));
diff --git a/src/plugins/rssyl/rssyl_prefs.h b/src/plugins/rssyl/rssyl_prefs.h
index 4f12647cb..5e746f038 100644
--- a/src/plugins/rssyl/rssyl_prefs.h
+++ b/src/plugins/rssyl/rssyl_prefs.h
@@ -33,7 +33,6 @@ struct _RPrefs {
 	gboolean refresh_enabled;
 	gint refresh;
 	gboolean refresh_on_startup;
-	gboolean refresh_all_skips;
 	gchar *cookies_path;
 	gboolean ssl_verify_peer;
 };
@@ -45,7 +44,6 @@ struct _RPrefsPage {
 	GtkWidget *refresh_enabled;
 	GtkWidget *refresh;
 	GtkWidget *refresh_on_startup;
-	GtkWidget *refresh_all_skips;
 	GtkWidget *cookies_path;
 	GtkWidget *ssl_verify_peer;
 };
diff --git a/src/plugins/rssyl/rssyl_update_feed.c b/src/plugins/rssyl/rssyl_update_feed.c
index c65d21ac9..bd4ead851 100644
--- a/src/plugins/rssyl/rssyl_update_feed.c
+++ b/src/plugins/rssyl/rssyl_update_feed.c
@@ -317,13 +317,8 @@ static gboolean rssyl_update_recursively_func(GNode *node, gpointer data)
 	ritem = (RFolderItem *)item;
 
 	if( ritem->url != NULL ) {
-		if(rssyl_prefs_get()->refresh_all_skips &&
-			(ritem->default_refresh_interval == FALSE) && (ritem->refresh_interval == 0)) {
-			debug_print("RSSyl: Skipping feed '%s'\n", item->name);
-		} else {
-			debug_print("RSSyl: Updating feed '%s'\n", item->name);
-			rssyl_update_feed(ritem, 0);
-		}
+		debug_print("RSSyl: Updating feed '%s'\n", item->name);
+		rssyl_update_feed(ritem, 0);
 	} else
 		debug_print("RSSyl: Updating in folder '%s'\n", item->name);
 
diff --git a/src/procmsg.c b/src/procmsg.c
index d806604e1..4a60fbe7b 100644
--- a/src/procmsg.c
+++ b/src/procmsg.c
@@ -906,7 +906,6 @@ parse_again:
 	if (orig && g_slist_length(orig)) {
 		if (!last_account && nothing_to_sort) {
 			/* can't find an account for the rest of the list */
-fprintf(stderr, "==> 1220858 logically dead code\n");
 			cur = orig;
 			while (cur) {
 				result = g_slist_append(result, cur->data);

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


hooks/post-receive
-- 
Claws Mail