From 13a56b2801b8a562519d5c90fb038d3d4f5d0f74 Mon Sep 17 00:00:00 2001 From: rbuj Date: Sun, 3 Mar 2019 10:43:16 +0100 Subject: Fix -Werror=cast-function-type with GCC 8 In addition, it removes unnecessary function type casts like: (GDestroyNotify) g_object_unref (GDestroyNotify) g_free --- mate-dictionary/src/gdict-app.c | 13 +++---------- mate-dictionary/src/gdict-sidebar.c | 5 ++--- 2 files changed, 5 insertions(+), 13 deletions(-) (limited to 'mate-dictionary/src') diff --git a/mate-dictionary/src/gdict-app.c b/mate-dictionary/src/gdict-app.c index cd751baa..a8b79b38 100644 --- a/mate-dictionary/src/gdict-app.c +++ b/mate-dictionary/src/gdict-app.c @@ -61,16 +61,9 @@ gdict_app_finalize (GObject *object) app->current_window = NULL; - g_slist_foreach (app->windows, - (GFunc) gtk_widget_destroy, - NULL); - g_slist_free (app->windows); - - g_slist_foreach (app->lookup_words, (GFunc) g_free, NULL); - g_slist_free (app->lookup_words); - - g_slist_foreach (app->match_words, (GFunc) g_free, NULL); - g_slist_free (app->match_words); + g_slist_free_full (app->windows, (GDestroyNotify) gtk_widget_destroy); + g_slist_free_full (app->lookup_words, g_free); + g_slist_free_full (app->match_words, g_free); g_free (app->database); g_free (app->source_name); diff --git a/mate-dictionary/src/gdict-sidebar.c b/mate-dictionary/src/gdict-sidebar.c index f2b46d5c..b903677c 100644 --- a/mate-dictionary/src/gdict-sidebar.c +++ b/mate-dictionary/src/gdict-sidebar.c @@ -116,8 +116,7 @@ gdict_sidebar_finalize (GObject *object) if (priv->pages) { - g_slist_foreach (priv->pages, (GFunc) sidebar_page_free, NULL); - g_slist_free (priv->pages); + g_slist_free_full (priv->pages, (GDestroyNotify) sidebar_page_free); } G_OBJECT_CLASS (gdict_sidebar_parent_class)->finalize (object); @@ -419,7 +418,7 @@ gdict_sidebar_add_page (GdictSidebar *sidebar, g_object_set_qdata_full (G_OBJECT (menu_item), sidebar_page_id_quark, g_strdup (page_id), - (GDestroyNotify) g_free); + g_free); g_signal_connect (menu_item, "activate", G_CALLBACK (gdict_sidebar_menu_item_activate), sidebar); -- cgit v1.2.1