Mercurial > pidgin3 / changeset

--- a/libpurple/account.c	Fri Oct 25 05:18:58 2019 -0400
+++ b/libpurple/account.c	Fri Oct 25 05:52:30 2019 -0400
@@ -1397,7 +1397,7 @@
 		l_next = l->next;
 
 		if (info->account == account) {
-			handles = g_list_remove(handles, info);
+			handles = g_list_delete_link(handles, l);
 			purple_account_request_close_info(info);
 		}
 	}
@@ -1416,7 +1416,7 @@
 		l_next = l->next;
 
 		if (info->ui_handle == ui_handle) {
-			handles = g_list_remove(handles, info);
+			handles = g_list_delete_link(handles, l);
 			purple_account_request_close_info(info);
 		}
 	}

--- a/libpurple/cmds.c	Fri Oct 25 05:18:58 2019 -0400
+++ b/libpurple/cmds.c	Fri Oct 25 05:52:30 2019 -0400
@@ -107,7 +107,7 @@
 			if (ops && ops->unregister_command)
 				ops->unregister_command(c->cmd, c->protocol_id);
 
-			cmds = g_list_remove(cmds, c);
+			cmds = g_list_delete_link(cmds, l);
 			purple_signal_emit(purple_cmds_get_handle(), "cmd-removed", c->cmd);
 			purple_cmd_free(c);
 			return;

--- a/libpurple/group.c	Fri Oct 25 05:18:58 2019 -0400
+++ b/libpurple/group.c	Fri Oct 25 05:52:30 2019 -0400
@@ -188,7 +188,8 @@
 	/* Notify all protocols */
 	/* TODO: Is this condition needed?  Seems like it would always be TRUE */
 	if(old_name && !purple_strequal(priv->name, old_name)) {
-		for (accts = purple_group_get_accounts(source); accts; accts = g_slist_remove(accts, accts->data)) {
+		for (accts = purple_group_get_accounts(source); accts;
+		     accts = g_slist_delete_link(accts, accts)) {
 			PurpleAccount *account = accts->data;
 			PurpleConnection *gc = NULL;
 			PurpleProtocol *protocol = NULL;

--- a/libpurple/notify.c	Fri Oct 25 05:18:58 2019 -0400
+++ b/libpurple/notify.c	Fri Oct 25 05:52:30 2019 -0400
@@ -783,7 +783,7 @@
 		PurpleNotifyInfo *info = l->data;
 
 		if (info->ui_handle == ui_handle) {
-			handles = g_list_remove(handles, info);
+			handles = g_list_delete_link(handles, l);
 
 			if (ops != NULL && ops->close_notify != NULL)
 				ops->close_notify(info->type, ui_handle);
@@ -812,7 +812,7 @@
 		PurpleNotifyInfo *info = l->data;
 
 		if (info->handle == handle) {
-			handles = g_list_remove(handles, info);
+			handles = g_list_delete_link(handles, l);
 
 			if (ops != NULL && ops->close_notify != NULL)
 				ops->close_notify(info->type, info->ui_handle);

--- a/libpurple/protocols/bonjour/mdns_avahi.c	Fri Oct 25 05:18:58 2019 -0400
+++ b/libpurple/protocols/bonjour/mdns_avahi.c	Fri Oct 25 05:52:30 2019 -0400
@@ -292,7 +292,8 @@
 
 				if (l != NULL) {
 					AvahiSvcResolverData *rd = l->data;
-					b_impl->resolvers = g_slist_remove(b_impl->resolvers, rd);
+					b_impl->resolvers =
+					        g_slist_delete_link(b_impl->resolvers, l);
 					/* This IP is no longer available */
 					if (rd->ip != NULL) {
 						bb->ips = g_slist_remove(bb->ips, rd->ip);

--- a/libpurple/protocols/bonjour/mdns_dns_sd.c	Fri Oct 25 05:18:58 2019 -0400
+++ b/libpurple/protocols/bonjour/mdns_dns_sd.c	Fri Oct 25 05:52:30 2019 -0400
@@ -434,7 +434,7 @@
 				idata->resolvers = g_slist_delete_link(idata->resolvers, l);
 				/* This IP is no longer available */
 				if (rd->ip != NULL) {
-					bb->ips = g_slist_remove(bb->ips, rd->ip);
+					bb->ips = g_slist_delete_link(bb->ips, l);
 					g_free((gchar *) rd->ip);
 				}
 				_cleanup_resolver_data(rd);

--- a/libpurple/protocols/jabber/buddy.c	Fri Oct 25 05:18:58 2019 -0400
+++ b/libpurple/protocols/jabber/buddy.c	Fri Oct 25 05:52:30 2019 -0400
@@ -1485,7 +1485,7 @@
 	while(jbi->ids) {
 		char *id = jbi->ids->data;
 		jabber_iq_remove_callback_by_id(jbi->js, id);
-		jbi->ids = g_slist_remove(jbi->ids, id);
+		jbi->ids = g_slist_delete_link(jbi->ids, jbi->ids);
 		g_free(id);
 	}
 

--- a/libpurple/protocols/jabber/roster.c	Fri Oct 25 05:18:58 2019 -0400
+++ b/libpurple/protocols/jabber/roster.c	Fri Oct 25 05:52:30 2019 -0400
@@ -320,7 +320,7 @@
 			g = purple_buddy_get_group(b);
 			groups = g_slist_append(groups,
 				(char *)jabber_roster_group_get_global_name(g));
-			buddies = g_slist_remove(buddies, b);
+			buddies = g_slist_delete_link(buddies, buddies);
 		}
 
 		tmp = roster_groups_join(groups);
@@ -445,7 +445,7 @@
 	while(buddies) {
 		b = buddies->data;
 		groups = g_slist_append(groups, (char*)new_group);
-		buddies = g_slist_remove(buddies, b);
+		buddies = g_slist_delete_link(buddies, buddies);
 	}
 
 	purple_debug_info("jabber", "jabber_roster_group_change(): Moving %s from %s to %s\n",
@@ -481,7 +481,7 @@
 			tmpgroup = purple_buddy_get_group(tmpbuddy);
 			groups = g_slist_append(groups,
 				(char *)jabber_roster_group_get_global_name(tmpgroup));
-			buddies = g_slist_remove(buddies, tmpbuddy);
+			buddies = g_slist_delete_link(buddies, buddies);
 		}
 
 		purple_debug_info("jabber", "jabber_roster_remove_buddy(): "

--- a/libpurple/protocols/novell/nmcontact.c	Fri Oct 25 05:18:58 2019 -0400
+++ b/libpurple/protocols/novell/nmcontact.c	Fri Oct 25 05:52:30 2019 -0400
@@ -683,7 +683,7 @@
 	node = folder->contacts;
 	while (node) {
 		if (contact->id == ((NMContact *) (node->data))->id) {
-			folder->contacts = g_slist_remove(folder->contacts, node->data);
+			folder->contacts = g_slist_delete_link(folder->contacts, node);
 			nm_release_contact(contact);
 			break;
 		}

--- a/libpurple/protocols/silc/chat.c	Fri Oct 25 05:18:58 2019 -0400
+++ b/libpurple/protocols/silc/chat.c	Fri Oct 25 05:52:30 2019 -0400
@@ -1145,7 +1145,7 @@
 		silc_client_del_channel_private_key(client, conn,
 						    channel, prv->key);
 		silc_free(prv);
-		sg->grps = g_list_remove(sg->grps, prv);
+		sg->grps = g_list_delete_link(sg->grps, l);
 		purple_serv_got_chat_left(gc, id);
 		return;
 	}
@@ -1177,7 +1177,7 @@
 							    prv->key);
 			purple_serv_got_chat_left(gc, prv->id);
 			silc_free(prv);
-			sg->grps = g_list_remove(sg->grps, prv);
+			sg->grps = g_list_delete_link(sg->grps, l);
 			if (!sg->grps)
 				break;
 		}

--- a/libpurple/request.c	Fri Oct 25 05:18:58 2019 -0400
+++ b/libpurple/request.c	Fri Oct 25 05:52:30 2019 -0400
@@ -2502,7 +2502,7 @@
 		PurpleRequestInfo *info = l->data;
 
 		if (info->ui_handle == ui_handle) {
-			handles = g_list_remove(handles, info);
+			handles = g_list_delete_link(handles, l);
 			purple_request_close_info(info);
 			break;
 		}
@@ -2522,7 +2522,7 @@
 		l_next = l->next;
 
 		if (info->handle == handle) {
-			handles = g_list_remove(handles, info);
+			handles = g_list_delete_link(handles, l);
 			purple_request_close_info(info);
 		}
 	}

--- a/libpurple/savedstatuses.c	Fri Oct 25 05:18:58 2019 -0400
+++ b/libpurple/savedstatuses.c	Fri Oct 25 05:52:30 2019 -0400
@@ -203,7 +203,7 @@
 			{
 				if (saved_status != current_status && saved_status != startup_status)
 				{
-					saved_statuses = g_list_remove(saved_statuses, saved_status);
+					saved_statuses = g_list_delete_link(saved_statuses, l);
 					creation_time = purple_savedstatus_get_creation_time(saved_status);
 					g_hash_table_remove(creation_times, (gconstpointer)creation_time);
 					free_saved_status(saved_status);

--- a/libpurple/server.c	Fri Oct 25 05:18:58 2019 -0400
+++ b/libpurple/server.c	Fri Oct 25 05:52:30 2019 -0400
@@ -74,7 +74,7 @@
 		lar = (struct last_auto_response *)cur->data;
 
 		if ((time(NULL) - lar->sent) > SECS_BEFORE_RESENDING_AUTORESPONSE) {
-			last_auto_responses = g_slist_remove(last_auto_responses, lar);
+			last_auto_responses = g_slist_delete_link(last_auto_responses, cur);
 			g_free(lar);
 		}
 	}

--- a/libpurple/util.c	Fri Oct 25 05:18:58 2019 -0400
+++ b/libpurple/util.c	Fri Oct 25 05:52:30 2019 -0400
@@ -1523,7 +1523,7 @@
 						}
 						if(tags == tag)
 							break;
-						tags = g_list_remove(tags, pt);
+						tags = g_list_delete_link(tags, tags);
 						g_free(pt);
 					}
 					g_free(tag->data);

--- a/pidgin/plugins/win32/winprefs/gtkappbar.c	Fri Oct 25 05:18:58 2019 -0400
+++ b/pidgin/plugins/win32/winprefs/gtkappbar.c	Fri Oct 25 05:52:30 2019 -0400
@@ -692,8 +692,7 @@
         }
         gtk_appbar_unregister(ab, hwnd);
 
-	while (ab->dock_cbs)
-		ab->dock_cbs = g_slist_remove(ab->dock_cbs, ab->dock_cbs->data);
+	g_slist_free(ab->dock_cbs);
 
 	g_free(ab);
 }