[Xfce4-commits] [xfce/xfce4-session] 06/06: Fixed warning "cast between incompatible function types" introduced in GCC 8
noreply at xfce.org
noreply at xfce.org
Sat Apr 6 23:38:31 CEST 2019
This is an automated email from the git hooks/post-receive script.
a n d r e p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository xfce/xfce4-session.
commit 9ba6164b98380eb6b5914606b32792ad761119ed
Author: Alexander Schwinn <alexxcons at xfce.org>
Date: Thu Feb 14 23:36:34 2019 +0100
Fixed warning "cast between incompatible function types" introduced in
GCC 8
---
engines/balou/config.c | 2 +-
engines/balou/gnome-uri.c | 3 ++-
settings/xfae-model.c | 2 +-
xfce4-session/xfsm-manager.c | 14 +++++++-------
xfce4-session/xfsm-properties.c | 4 ++--
5 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/engines/balou/config.c b/engines/balou/config.c
index 13709cb..f08ccea 100644
--- a/engines/balou/config.c
+++ b/engines/balou/config.c
@@ -881,7 +881,7 @@ config_create (XfsmSplashRc *rc)
GTK_SELECTION_SINGLE);
g_signal_connect (G_OBJECT (selection), "changed",
G_CALLBACK (config_selection_changed), NULL);
- g_idle_add ((GSourceFunc)config_selection_changed, selection);
+ g_idle_add (G_SOURCE_FUNC (config_selection_changed), selection);
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE);
gtk_container_add (GTK_CONTAINER (swin), treeview);
diff --git a/engines/balou/gnome-uri.c b/engines/balou/gnome-uri.c
index 29748b0..8cdad2b 100644
--- a/engines/balou/gnome-uri.c
+++ b/engines/balou/gnome-uri.c
@@ -27,6 +27,7 @@
#include <string.h>
#endif
+#include <glib-object.h>
#include <engines/balou/gnome-uri.h>
/*** the next three routines are taken straight from gnome-libs so that the
@@ -40,7 +41,7 @@
void
gnome_uri_list_free_strings (GList * list)
{
- g_list_foreach (list, (GFunc) g_free, NULL);
+ g_list_foreach (list, (GFunc) G_CALLBACK (g_free), NULL);
g_list_free (list);
}
diff --git a/settings/xfae-model.c b/settings/xfae-model.c
index f87d030..59ee10e 100644
--- a/settings/xfae-model.c
+++ b/settings/xfae-model.c
@@ -172,7 +172,7 @@ xfae_model_finalize (GObject *object)
XfaeModel *model = XFAE_MODEL (object);
/* free all items */
- g_list_foreach (model->items, (GFunc) xfae_item_free, NULL);
+ g_list_foreach (model->items, (GFunc) G_CALLBACK(xfae_item_free), NULL);
g_list_free (model->items);
G_OBJECT_CLASS (xfae_model_parent_class)->finalize (object);
diff --git a/xfce4-session/xfsm-manager.c b/xfce4-session/xfsm-manager.c
index fd4e7af..0b8cab6 100644
--- a/xfce4-session/xfsm-manager.c
+++ b/xfce4-session/xfsm-manager.c
@@ -225,19 +225,19 @@ xfsm_manager_finalize (GObject *obj)
g_object_unref (manager->shutdown_helper);
- g_queue_foreach (manager->pending_properties, (GFunc) xfsm_properties_free, NULL);
+ g_queue_foreach (manager->pending_properties, (GFunc) G_CALLBACK (xfsm_properties_free), NULL);
g_queue_free (manager->pending_properties);
- g_queue_foreach (manager->starting_properties, (GFunc) xfsm_properties_free, NULL);
+ g_queue_foreach (manager->starting_properties, (GFunc) G_CALLBACK (xfsm_properties_free), NULL);
g_queue_free (manager->starting_properties);
- g_queue_foreach (manager->restart_properties, (GFunc) xfsm_properties_free, NULL);
+ g_queue_foreach (manager->restart_properties, (GFunc) G_CALLBACK (xfsm_properties_free), NULL);
g_queue_free (manager->restart_properties);
- g_queue_foreach (manager->running_clients, (GFunc) g_object_unref, NULL);
+ g_queue_foreach (manager->running_clients, (GFunc) G_CALLBACK (g_object_unref), NULL);
g_queue_free (manager->running_clients);
- g_queue_foreach (manager->failsafe_clients, (GFunc) xfsm_failsafe_client_free, NULL);
+ g_queue_foreach (manager->failsafe_clients, (GFunc) G_CALLBACK (xfsm_failsafe_client_free), NULL);
g_queue_free (manager->failsafe_clients);
g_free (manager->session_name);
@@ -294,7 +294,7 @@ static gboolean
xfsm_manager_startup (XfsmManager *manager)
{
xfsm_startup_foreign (manager);
- g_queue_sort (manager->pending_properties, (GCompareDataFunc) xfsm_properties_compare, NULL);
+ g_queue_sort (manager->pending_properties, (GCompareDataFunc) G_CALLBACK (xfsm_properties_compare), NULL);
xfsm_startup_begin (manager);
return FALSE;
}
@@ -1739,7 +1739,7 @@ xfsm_manager_start_client_save_timeout (XfsmManager *manager,
* timer, this call will clear it. */
g_object_set_data_full (G_OBJECT (client), "--save-timeout-id",
GUINT_TO_POINTER (sdata->timeout_id),
- (GDestroyNotify) g_source_remove);
+ (GDestroyNotify) G_CALLBACK (g_source_remove));
}
diff --git a/xfce4-session/xfsm-properties.c b/xfce4-session/xfsm-properties.c
index e9c943c..754b178 100644
--- a/xfce4-session/xfsm-properties.c
+++ b/xfce4-session/xfsm-properties.c
@@ -193,7 +193,7 @@ xfsm_properties_new (const gchar *client_id,
properties->hostname = g_strdup (hostname);
properties->pid = -1;
- properties->sm_properties = g_tree_new_full ((GCompareDataFunc) strcmp,
+ properties->sm_properties = g_tree_new_full ((GCompareDataFunc) G_CALLBACK (strcmp),
NULL,
(GDestroyNotify) g_free,
(GDestroyNotify) xfsm_g_value_free);
@@ -697,7 +697,7 @@ xfsm_properties_set_default_child_watch (XfsmProperties *properties)
/* if the PID is still open, we need to close it,
* or it will become a zombie when it quits */
g_child_watch_add (properties->pid,
- (GChildWatchFunc) g_spawn_close_pid,
+ (GChildWatchFunc) G_CALLBACK (g_spawn_close_pid),
NULL);
properties->pid = -1;
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list