From 7ef16481803ffa951dc0ea5cc14d3b80b5e17a7b Mon Sep 17 00:00:00 2001 From: mjentsch Date: Tue, 20 Jan 2015 00:23:32 +0100 Subject: [PATCH] Remove more functions unsupported in old glib versions --- tgp-structs.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/tgp-structs.c b/tgp-structs.c index 3ddb012..2588108 100644 --- a/tgp-structs.c +++ b/tgp-structs.c @@ -90,6 +90,16 @@ static void used_image_free (gpointer data) debug ("used_image: unref %d", id); } +static void queue_free_full (GQueue *queue, GDestroyNotify free_func) +{ + void *entry; + + while ((entry = g_queue_pop_head(queue))) { + free_func (entry); + } + g_queue_free (queue); +} + void used_images_add (connection_data *data, gint imgid) { data->used_images = g_list_append (data->used_images, GINT_TO_POINTER(imgid)); @@ -111,8 +121,8 @@ connection_data *connection_data_init (struct tgl_state *TLS, PurpleConnection * void *connection_data_free (connection_data *conn) { purple_timeout_remove(conn->timer); - g_queue_free_full (conn->pending_reads, pending_reads_free_cb); - g_queue_free_full (conn->new_messages, message_text_free); + queue_free_full (conn->pending_reads, pending_reads_free_cb); + queue_free_full (conn->new_messages, message_text_free); g_hash_table_destroy (conn->joining_chats); g_list_free_full (conn->used_images, used_image_free); tgl_free_all (conn->TLS);