Changeset 6e991a9 for protocols

Timestamp:

2016-10-16T06:51:53Z (8 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

2906268

Parents:

a08b2db

git-author:

dequis <dx@…> (16-10-16 06:50:49)

git-committer:

dequis <dx@…> (16-10-16 06:51:53)

Message:

Turn purple_chatlist_free() into a imcb_chat_list_free()

I found myself copypasting this to jabber. Might as well make it part of
the API.

Location:

protocols

Files:

• bee.h (modified) (1 diff)
• bee_chat.c (modified) (1 diff)
• purple/purple.c (modified) (3 diffs)

protocols/bee.h

@@ -192 +192 @@
 G_GNUC_DEPRECATED G_MODULE_EXPORT void bee_chat_list_finish(struct im_connection *ic);
 G_MODULE_EXPORT void imcb_chat_list_finish(struct im_connection *ic);
+G_MODULE_EXPORT void imcb_chat_list_free(struct im_connection *ic);
 
 #endif /* __BEE_H__ */

protocols/bee_chat.c

@@ -285 +285 @@
         imcb_chat_list_finish(ic);
 }
+
+void imcb_chat_list_free(struct im_connection *ic)
+{
+        bee_chat_info_t *ci;
+        GSList *l = ic->chatlist;
+
+        while (l) {
+                ci = l->data;
+                l = g_slist_delete_link(l, l);
+
+                g_free(ci->title);
+                g_free(ci->topic);
+                g_free(ci);
+        }
+
+        ic->chatlist = NULL;
+}

protocols/purple/purple.c

@@ -361 +361 @@
 }
 
-static void purple_chatlist_free(struct im_connection *ic)
-{
-        bee_chat_info_t *ci;
-        GSList *l = ic->chatlist;
-
-        while (l) {
-                ci = l->data;
-                l = g_slist_delete_link(l, l);
-
-                g_free(ci->title);
-                g_free(ci->topic);
-                g_free(ci);
-        }
-}
-
 static void purple_logout(struct im_connection *ic)
 {
@@ -391 +376 @@
         purple_connections = g_slist_remove(purple_connections, ic);
         purple_accounts_remove(pd->account);
-        purple_chatlist_free(ic);
+        imcb_chat_list_free(ic);
         g_hash_table_destroy(pd->input_requests);
         g_free(pd);
@@ -1402 +1387 @@
 
         ic = purple_ic_by_pa(list->account);
-        purple_chatlist_free(ic);
+        imcb_chat_list_free(ic);
 
         ic->chatlist = g_slist_reverse(rld->chats);