Mercurial > pidgin3 / changeset

--- a/libpurple/purpleroomlistroom.c	Mon May 02 23:43:16 2022 -0500
+++ b/libpurple/purpleroomlistroom.c	Tue May 03 00:50:48 2022 -0500
@@ -289,7 +289,7 @@
 
 	priv = purple_roomlist_room_get_instance_private(room);
 
-	g_hash_table_replace(priv->components, field, g_strdup(value));
+	g_hash_table_replace(priv->components, (gpointer)field, g_strdup(value));
 }
 
 const gchar *

--- a/libpurple/roomlist.c	Mon May 02 23:43:16 2022 -0500
+++ b/libpurple/roomlist.c	Tue May 03 00:50:48 2022 -0500
@@ -149,7 +149,7 @@
 }
 
 void
-purple_roomlist_join_room(PurpleRoomlist *roomlist, PurpleRoomlistRoom *room) {
+purple_roomlist_join_room(PurpleRoomlist *list, PurpleRoomlistRoom *room) {
 	PurpleRoomlistPrivate *priv = NULL;
 	PurpleConnection *connection = NULL;
 	GHashTable *components = NULL, *adjusted = NULL;
@@ -157,10 +157,10 @@
 	const gchar *name = NULL;
 	gpointer key, value;
 
-	g_return_if_fail(PURPLE_IS_ROOMLIST(roomlist));
+	g_return_if_fail(PURPLE_IS_ROOMLIST(list));
 	g_return_if_fail(PURPLE_IS_ROOMLIST_ROOM(room));
 
-	priv = purple_roomlist_get_instance_private(roomlist);
+	priv = purple_roomlist_get_instance_private(list);
 
 	connection = purple_account_get_connection(priv->account);
 	if(connection == NULL) {

--- a/libpurple/roomlist.h	Mon May 02 23:43:16 2022 -0500
+++ b/libpurple/roomlist.h	Tue May 03 00:50:48 2022 -0500
@@ -234,7 +234,7 @@
  *
  * Since: 3.0.0
  */
-void purple_roomlist_join_room(PurpleRoomlist *roomlist, PurpleRoomlistRoom *room);
+void purple_roomlist_join_room(PurpleRoomlist *list, PurpleRoomlistRoom *room);
 
 /**************************************************************************/
 /* UI Registration Functions                                              */