[Commits] [SCM] claws branch, master, updated. 4.3.1-75-gef89db3fd

wwp at claws-mail.org wwp at claws-mail.org
Wed Mar 26 21:15:25 UTC 2025


The branch, master has been updated
  discards  0d24bc16e361ba27985b0c903bc21c432ee4b387 (commit)
  discards  c832dbc83a52a905f3ba08e54e9afce0c0c96785 (commit)
       via  ef89db3fd502c490a0e712f0b651e6c972b2ac62 (commit)
       via  9c46ac947a4a0a31fa4ce90a3f66c7a9dc630fd5 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (0d24bc16e361ba27985b0c903bc21c432ee4b387)
            \
             N -- N -- N (ef89db3fd502c490a0e712f0b651e6c972b2ac62)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

Summary of changes:


- Log -----------------------------------------------------------------
commit ef89db3fd502c490a0e712f0b651e6c972b2ac62
Author: wwp <subscript at free.fr>
Date:   Wed Mar 26 22:06:24 2025 +0100

    Mail archiver plugin: better sentences.

diff --git a/src/plugins/archive/archiver_gtk.c b/src/plugins/archive/archiver_gtk.c
index 0a71cd4fb..a3292899b 100644
--- a/src/plugins/archive/archiver_gtk.c
+++ b/src/plugins/archive/archiver_gtk.c
@@ -557,13 +557,13 @@ static gboolean archiver_save_files(struct ArchivePage* page) {
 	if ((perm = file_is_writeable(page)) != A_FILE_OK) {
 		switch (perm) {
 			case A_FILE_EXISTS:
-				msg = g_strdup_printf(_("%s: Exists. Continue anyway?"), page->name);
+				msg = g_strdup_printf(_("%s exists. Continue anyway?"), page->name);
 				break;
 			case A_FILE_IS_LINK:
-				msg = g_strdup_printf(_("%s: Is a link. Cannot continue"), page->name);
+				msg = g_strdup_printf(_("%s is a link. Cannot continue"), page->name);
 				break;
 			 case A_FILE_IS_DIR:
-				 msg = g_strdup_printf(_("%s: Is a directory. Cannot continue"), page->name);
+				 msg = g_strdup_printf(_("%s is a directory. Cannot continue"), page->name);
 				break;
 			case A_FILE_NO_WRITE:
 				 msg = g_strdup_printf(_("%s: Missing permissions. Cannot continue"), page->name);
diff --git a/src/plugins/archive/libarchive_archive.c b/src/plugins/archive/libarchive_archive.c
index c2416b356..b2ce3d2dc 100644
--- a/src/plugins/archive/libarchive_archive.c
+++ b/src/plugins/archive/libarchive_archive.c
@@ -756,7 +756,7 @@ int main(int argc, char** argv) {
 		archive_scan_folder(*argv++);
 		res = archive_create(archive, file_list, GZIP, TAR);
 		if (res != NULL) {
-			fprintf(stderr, "%s: Creating archive failed [%s]\n", archive, res);
+			fprintf(stderr, "Creating archive '%s' failed [%s]\n", archive, res);
 			return EXIT_FAILURE;
 		}
 	}

commit 9c46ac947a4a0a31fa4ce90a3f66c7a9dc630fd5
Author: wwp <subscript at free.fr>
Date:   Wed Mar 26 22:02:28 2025 +0100

    No need to shout even in debug messages.

diff --git a/src/plugins/rssyl/rssyl_update_feed.c b/src/plugins/rssyl/rssyl_update_feed.c
index 98c531ddc..1b02ad31a 100644
--- a/src/plugins/rssyl/rssyl_update_feed.c
+++ b/src/plugins/rssyl/rssyl_update_feed.c
@@ -312,7 +312,7 @@ gboolean rssyl_update_feed(RFolderItem *ritem, RSSylVerboseFlags verbose)
 
 	rssyl_deleted_update(ritem);
 
-	debug_print("RSSyl: STARTING TO PARSE FEED\n");
+	debug_print("RSSyl: Starting to parse feed\n");
 	if( ctx->success && !(ctx->success = rssyl_parse_feed(ritem, ctx->feed)) ) {
 		/* both libcurl and libfeed were happy, but we weren't */
 		debug_print("RSSyl: Error processing feed\n");
@@ -328,7 +328,7 @@ gboolean rssyl_update_feed(RFolderItem *ritem, RSSylVerboseFlags verbose)
 		log_error(LOG_PROTOCOL, RSSYL_LOG_ERROR_PROC, ctx->feed->url);
 	}
 	
-	debug_print("RSSyl: FEED PARSED\n");
+	debug_print("RSSyl: Feed parsed\n");
 
 	STATUSBAR_POP(mainwin);
 

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


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list