summaryrefslogtreecommitdiff
path: root/pluma/pluma-message-bus.c
diff options
context:
space:
mode:
authorrbuj <[email protected]>2020-02-28 09:07:37 +0100
committerraveit65 <[email protected]>2020-03-14 13:14:35 +0100
commit28a6895df5fa4a1a60c794ed5e85e31d764e85e7 (patch)
treef9b5d3eae40ecb5bd8eb357c10ce8458b2faa7f9 /pluma/pluma-message-bus.c
parentd265d00b72fc9a7fb126079780303df9ea217a29 (diff)
downloadpluma-28a6895df5fa4a1a60c794ed5e85e31d764e85e7.tar.bz2
pluma-28a6895df5fa4a1a60c794ed5e85e31d764e85e7.tar.xz
Remove warnings: cast between incompatible function types
Diffstat (limited to 'pluma/pluma-message-bus.c')
-rw-r--r--pluma/pluma-message-bus.c14
1 files changed, 3 insertions, 11 deletions
diff --git a/pluma/pluma-message-bus.c b/pluma/pluma-message-bus.c
index 621a1d03..fc10a9d5 100644
--- a/pluma/pluma-message-bus.c
+++ b/pluma/pluma-message-bus.c
@@ -158,20 +158,12 @@ message_free (Message *message)
g_free (message->method);
g_free (message->object_path);
- g_list_foreach (message->listeners, (GFunc)listener_free, NULL);
- g_list_free (message->listeners);
+ g_list_free_full (message->listeners, (GDestroyNotify) listener_free);
g_free (message);
}
static void
-message_queue_free (GList *queue)
-{
- g_list_foreach (queue, (GFunc)g_object_unref, NULL);
- g_list_free (queue);
-}
-
-static void
pluma_message_bus_finalize (GObject *object)
{
PlumaMessageBus *bus = PLUMA_MESSAGE_BUS (object);
@@ -179,7 +171,7 @@ pluma_message_bus_finalize (GObject *object)
if (bus->priv->idle_id != 0)
g_source_remove (bus->priv->idle_id);
- message_queue_free (bus->priv->message_queue);
+ g_list_free_full (bus->priv->message_queue, g_object_unref);
g_hash_table_destroy (bus->priv->messages);
g_hash_table_destroy (bus->priv->idmap);
@@ -432,7 +424,7 @@ idle_dispatch (PlumaMessageBus *bus)
dispatch_message (bus, msg);
}
- message_queue_free (list);
+ g_list_free_full (list, g_object_unref);
return FALSE;
}