From 2570b9ab7f8e26c0035bd6fb5401cba99d682ac4 Mon Sep 17 00:00:00 2001 From: rbuj Date: Tue, 7 Apr 2020 14:12:38 +0200 Subject: Fix some cast-function-type warnings introduced in GCC 8 --- applets/notification_area/system-tray/na-tray-child.c | 7 ++++++- applets/notification_area/system-tray/na-tray-child.h | 4 +++- applets/notification_area/system-tray/na-tray.c | 2 +- applets/wncklet/window-list.c | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) (limited to 'applets') diff --git a/applets/notification_area/system-tray/na-tray-child.c b/applets/notification_area/system-tray/na-tray-child.c index cc45abc3..cd7c305a 100644 --- a/applets/notification_area/system-tray/na-tray-child.c +++ b/applets/notification_area/system-tray/na-tray-child.c @@ -557,8 +557,13 @@ na_tray_child_set_composited (NaTrayChild *child, * the child is shifted with respect to the background. */ void -na_tray_child_force_redraw (NaTrayChild *child) +na_tray_child_force_redraw (gpointer key, + gpointer value, + gpointer user_data) { + (void) value; + (void) user_data; + NaTrayChild *child = key; GtkWidget *widget = GTK_WIDGET (child); if (gtk_widget_get_mapped (widget)) diff --git a/applets/notification_area/system-tray/na-tray-child.h b/applets/notification_area/system-tray/na-tray-child.h index aa39658a..5865adab 100644 --- a/applets/notification_area/system-tray/na-tray-child.h +++ b/applets/notification_area/system-tray/na-tray-child.h @@ -73,7 +73,9 @@ char *na_tray_child_get_title (NaTrayChild *child); gboolean na_tray_child_has_alpha (NaTrayChild *child); void na_tray_child_set_composited (NaTrayChild *child, gboolean composited); -void na_tray_child_force_redraw (NaTrayChild *child); +void na_tray_child_force_redraw (gpointer key, + gpointer value, + gpointer user_data); void na_tray_child_get_wm_class (NaTrayChild *child, char **res_name, char **res_class); diff --git a/applets/notification_area/system-tray/na-tray.c b/applets/notification_area/system-tray/na-tray.c index 8cf1b9ec..fee75dc8 100644 --- a/applets/notification_area/system-tray/na-tray.c +++ b/applets/notification_area/system-tray/na-tray.c @@ -715,7 +715,7 @@ idle_redraw_cb (NaTray *tray) NaTrayPrivate *priv = tray->priv; g_hash_table_foreach (priv->trays_screen->icon_table, - (GHFunc) na_tray_child_force_redraw, NULL); + na_tray_child_force_redraw, NULL); priv->idle_redraw_id = 0; diff --git a/applets/wncklet/window-list.c b/applets/wncklet/window-list.c index 5ce9e48b..85670666 100644 --- a/applets/wncklet/window-list.c +++ b/applets/wncklet/window-list.c @@ -308,7 +308,7 @@ static gboolean applet_enter_notify_event (WnckTasklist *tl, GList *wnck_windows gtk_widget_show (tasklist->preview); - g_signal_connect_data (G_OBJECT (tasklist->preview), "draw", G_CALLBACK (preview_window_draw), thumbnail, (GClosureNotify) g_object_unref, 0); + g_signal_connect_data (G_OBJECT (tasklist->preview), "draw", G_CALLBACK (preview_window_draw), thumbnail, (GClosureNotify) G_CALLBACK (g_object_unref), 0); return FALSE; } -- cgit v1.2.1