From 38772a1a4ab9f9ebf26d6d5726266418ba57f0b7 Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Thu, 14 Aug 2014 07:52:53 -0400 Subject: Made the custom GTK+ container's forall safer in container_unix.c. --- redo/container_unix.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'redo/container_unix.c') diff --git a/redo/container_unix.c b/redo/container_unix.c index c7a71dd..10a33c3 100644 --- a/redo/container_unix.c +++ b/redo/container_unix.c @@ -86,10 +86,25 @@ static void goContainer_get_preferred_height(GtkWidget *widget, gint *min, gint } */ +struct forall { + GtkCallback callback; + gpointer data; +}; + +static void doforall(gpointer obj, gpointer data) +{ + struct forall *s = (struct forall *) data; + + (*(s->callback))(GTK_WIDGET(obj), s->data); +} + static void goContainer_forall(GtkContainer *container, gboolean includeInternals, GtkCallback callback, gpointer data) { - /* TODO is this safe? */ - g_ptr_array_foreach(GOCONTAINER(container)->children, callback, data); + struct forall s; + + s.callback = callback; + s.data = data; + g_ptr_array_foreach(GOCONTAINER(container)->children, doforall, &s); } static void goContainer_class_init(goContainerClass *class) -- cgit v1.2.3