[Commits] [SCM] claws branch, master, updated. 4.1.1-106-ga8e4b62dd

[paul at claws-mail.org]

The branch, master has been updated
       via  a8e4b62ddf09c668ad59d78dea9d71ab23804982 (commit)
      from  2ffed01637e85f3751d9e3329eb6446a0861cbd0 (commit)

Summary of changes:
 src/addrmerge.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)


- Log -----------------------------------------------------------------
commit a8e4b62ddf09c668ad59d78dea9d71ab23804982
Author: Paul <paul at claws-mail.org>
Date:   Thu Oct 26 10:01:54 2023 +0100

    fix CID 1548056:  Error handling issues

diff --git a/src/addrmerge.c b/src/addrmerge.c
index b0688f0b7..3258e04a8 100644
--- a/src/addrmerge.c
+++ b/src/addrmerge.c
@@ -1,5 +1,5 @@
 /* Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 2014-2019 Charles Lehner and the Claws Mail team
+ * Copyright (C) 2014-2023 the Claws Mail team and Charles Lehner
  *
  * 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
@@ -395,10 +395,7 @@ void addrmerge_merge(
 
 	/* Test for read only */
 	if( ds->interface->readOnly ) {
-		alertpanel(_("Merge addresses"),
-			   _("This address data is read-only and cannot be deleted."),
-			   "window-close", _("_Close"), NULL, NULL, NULL, NULL,
-			   ALERTFOCUS_FIRST );
+		alertpanel_warning(_("This address data is read-only and cannot be deleted."));
 		return;
 	}
 

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


hooks/post-receive
-- 
Claws Mail