[Commits] [SCM] claws branch, gtk3tree, updated. 4.0.0-394-ge72048ce5

[paul at claws-mail.org]

The branch, gtk3tree has been updated
       via  e72048ce5ef93ab7552098a8c05d9bf4b05020de (commit)
      from  3e3a6b760fc0495dead8a47a70eb8aaa5206746d (commit)

Summary of changes:
 src/addrduplicates.c | 2 +-
 src/common/utils.c   | 5 -----
 src/common/utils.h   | 5 -----
 src/procmsg.c        | 8 ++++----
 4 files changed, 5 insertions(+), 15 deletions(-)


- Log -----------------------------------------------------------------
commit e72048ce5ef93ab7552098a8c05d9bf4b05020de
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date:   Mon Sep 27 00:31:11 2021 -0700

    Remove slist_copy_deep wrapper

diff --git a/src/addrduplicates.c b/src/addrduplicates.c
index 05e619c7d..6e7e8e3f2 100644
--- a/src/addrduplicates.c
+++ b/src/addrduplicates.c
@@ -272,7 +272,7 @@ static gint collect_emails(ItemPerson *itemperson, AddressDataSource *ds)
 		addr = g_utf8_strdown(email->address, -1);
 		old_val = g_hash_table_lookup(addr_hash, addr);
 		if(old_val)
-			new_val = slist_copy_deep(old_val, (GCopyFunc)copy_hash_val);
+			new_val = g_slist_copy_deep(old_val, (GCopyFunc)copy_hash_val, NULL);
 		else
 			new_val = NULL;
 
diff --git a/src/common/utils.c b/src/common/utils.c
index 070af31fc..73c90393a 100644
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -93,11 +93,6 @@
 
 static gboolean debug_mode = FALSE;
 
-GSList *slist_copy_deep(GSList *list, GCopyFunc func)
-{
-	return g_slist_copy_deep(list, func, NULL);
-}
-
 void list_free_strings_full(GList *list)
 {
 	g_list_free_full(list, (GDestroyNotify)g_free);
diff --git a/src/common/utils.h b/src/common/utils.h
index 55909d588..f908114e3 100644
--- a/src/common/utils.h
+++ b/src/common/utils.h
@@ -248,11 +248,6 @@ gboolean debug_get_mode		(void);
 #define Str(x)	#x
 #define Xstr(x)	Str(x)
 
-/* List utilities. */
-
-GSList *slist_copy_deep		(GSList		*list,
-				 GCopyFunc	 func);
-
 /* String utilities.  */
 
 void list_free_strings_full		(GList		*list);
diff --git a/src/procmsg.c b/src/procmsg.c
index 4c7efb5e3..063818a7d 100644
--- a/src/procmsg.c
+++ b/src/procmsg.c
@@ -1291,8 +1291,8 @@ MsgInfo *procmsg_msginfo_copy(MsgInfo *msginfo)
 	if (msginfo->extradata) {
 		newmsginfo->extradata = g_new0(MsgInfoExtraData, 1);
 		if (msginfo->extradata->avatars) {
-			newmsginfo->extradata->avatars = slist_copy_deep(msginfo->extradata->avatars,
-								(GCopyFunc) procmsg_msginfoavatar_copy);
+			newmsginfo->extradata->avatars = g_slist_copy_deep(msginfo->extradata->avatars,
+								(GCopyFunc) procmsg_msginfoavatar_copy, NULL);
 		}
 		MEMBDUP(extradata->dispositionnotificationto);
 		MEMBDUP(extradata->returnreceiptto);
@@ -1354,8 +1354,8 @@ MsgInfo *procmsg_msginfo_get_full_info_from_file(MsgInfo *msginfo, const gchar *
 		if (!msginfo->extradata->list_owner)
 			msginfo->extradata->list_owner = g_strdup(full_msginfo->extradata->list_owner);
 		if (!msginfo->extradata->avatars)
-			msginfo->extradata->avatars = slist_copy_deep(full_msginfo->extradata->avatars,
-									(GCopyFunc) procmsg_msginfoavatar_copy);
+			msginfo->extradata->avatars = g_slist_copy_deep(full_msginfo->extradata->avatars,
+									(GCopyFunc) procmsg_msginfoavatar_copy, NULL);
 		if (!msginfo->extradata->dispositionnotificationto)
 			msginfo->extradata->dispositionnotificationto = 
 				g_strdup(full_msginfo->extradata->dispositionnotificationto);

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


hooks/post-receive
-- 
Claws Mail