From: David Woodhouse <dwmw@amazon.co.uk>
Date: Thu, 5 Apr 2018 11:39:50 +0000 (+0100)
Subject: Make purple_chime_{destroy,init}_chats take a PurpleConnection
X-Git-Tag: v0.9~43
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8985733572d00a4deaad5cc7711f33113485c82f;p=pidgin-chime.git

Make purple_chime_{destroy,init}_chats take a PurpleConnection

These have slowly been changed; let's make them consistent again.
---

diff --git a/chat.c b/chat.c
index 5941830..0731f2a 100644
--- a/chat.c
+++ b/chat.c
@@ -612,8 +612,10 @@ int chime_purple_chat_send(PurpleConnection *conn, int id, const char *message,
 	return 0;
 }
 
-void purple_chime_init_chats(struct purple_chime *pc)
+void purple_chime_init_chats(PurpleConnection *conn)
 {
+	struct purple_chime *pc = purple_connection_get_protocol_data(conn);
+
 	pc->live_chats = g_hash_table_new(g_direct_hash, g_direct_equal);
 	pc->chats_by_room = g_hash_table_new(g_direct_hash, g_direct_equal);
 
@@ -621,8 +623,9 @@ void purple_chime_init_chats(struct purple_chime *pc)
 
 }
 
-void purple_chime_destroy_chats(struct purple_chime *pc)
+void purple_chime_destroy_chats(PurpleConnection *conn)
 {
+	struct purple_chime *pc = purple_connection_get_protocol_data(conn);
 	GList *chats = g_hash_table_get_values(pc->live_chats);
 	while (chats) {
 		chime_destroy_chat(chats->data);
diff --git a/chime.c b/chime.c
index 3f40fa2..34ab2d6 100644
--- a/chime.c
+++ b/chime.c
@@ -199,7 +199,7 @@ static void chime_purple_login(PurpleAccount *account)
 	purple_connection_set_protocol_data(conn, pc);
 	purple_chime_init_meetings(conn);
 	purple_chime_init_conversations(conn);
-	purple_chime_init_chats(pc);
+	purple_chime_init_chats(conn);
 	purple_chime_init_messages(conn);
 
 	pc->cxn = chime_connection_new(conn, server, devtoken, token);
@@ -243,7 +243,7 @@ static void chime_purple_close(PurpleConnection *conn)
 	purple_chime_destroy_meetings(conn);
 	purple_chime_destroy_messages(conn);
 	purple_chime_destroy_conversations(conn);
-	purple_chime_destroy_chats(pc);
+	purple_chime_destroy_chats(conn);
 
 	chime_connection_disconnect(pc->cxn);
 	g_clear_object(&pc->cxn);
diff --git a/chime.h b/chime.h
index 38f9710..add68ea 100644
--- a/chime.h
+++ b/chime.h
@@ -86,8 +86,8 @@ gchar *chime_purple_roomlist_room_serialize(PurpleRoomlistRoom *room);
 struct chime_chat;
 
 void purple_chime_init_chats_post(PurpleConnection *conn);
-void purple_chime_init_chats(struct purple_chime *pc);
-void purple_chime_destroy_chats(struct purple_chime *pc);
+void purple_chime_init_chats(PurpleConnection *conn);
+void purple_chime_destroy_chats(PurpleConnection *conn);
 void chime_destroy_chat(struct chime_chat *chat);
 void chime_purple_join_chat(PurpleConnection *conn, GHashTable *data);
 void chime_purple_chat_leave(PurpleConnection *conn, int id);