Changeset 50ddfad for protocols/rpc/rpc.c

Timestamp:

2015-05-29T05:20:27Z (9 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

dcfa886

Parents:

b73409f

Message:

Better cleanup of chatrooms at logout time.

I forgot that the IM module is responsible for that. Which is not great, but
I'm not going to fix that now.. (nor probably ever)

File:

• protocols/rpc/rpc.c (modified) (4 diffs)

protocols/rpc/rpc.c

@@ -297 +297 @@
 }
 
+static void rpc_groupchat_free(struct groupchat *gc);
+
 static void rpc_logout(struct im_connection *ic) {
         RPC_OUT_INIT("logout");
@@ -303 +305 @@
 
         struct rpc_connection *rd = ic->proto_data;
+
+        GHashTableIter iter;
+        struct rpc_groupchat *rc;
+        g_hash_table_iter_init(&iter, rd->groupchats);
+        while (g_hash_table_iter_next(&iter, NULL, (gpointer*)&rc)) {
+                rpc_groupchat_free(rc->gc);
+        }
+
         b_event_remove(ic->inpa);
         closesocket(rd->fd);
@@ -399 +409 @@
         json_array_append_integer(params, rc->id);
         rpc_send(gc->ic, rpc);
+        rpc_groupchat_free(gc);
 }
 
@@ -425 +436 @@
 
         return rc;
+}
+
+static void rpc_groupchat_free(struct groupchat *gc) {
+        g_free(gc->data);
+        imcb_chat_free(gc);
 }