[Commits] [SCM] claws branch, gtk2, updated. 3.19.1-90-g7b2104e17

[paul at claws-mail.org]

The branch, gtk2 has been updated
       via  7b2104e17a2030bc9783313a3e76ddcc2022111e (commit)
      from  2ea2cc2f666fdd99d14e96618f999674ab18f052 (commit)

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


- Log -----------------------------------------------------------------
commit 7b2104e17a2030bc9783313a3e76ddcc2022111e
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 e26a4bc55..4fdf5f3dc 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 Charles Lehner and the Claws Mail team
+/* Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * 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
@@ -394,9 +394,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."),
-			GTK_STOCK_CLOSE, NULL, NULL, ALERTFOCUS_FIRST );
+		alertpanel_warning(_("This address data is read-only and cannot be deleted."));
 		return;
 	}
 

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


hooks/post-receive
-- 
Claws Mail