From fe609331862020099537fa85952e64085244eab1 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 21 Feb 2002 03:57:33 +0000 Subject: [PATCH] Fix implicit conversions between void * and function pointer (Miroslaw Wed Feb 20 22:55:15 2002 Owen Taylor * gobject.c: Fix implicit conversions between void * and function pointer (Miroslaw Dobrzanski-Neumann, #71963) --- gobject/ChangeLog | 5 +++++ gobject/gobject.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gobject/ChangeLog b/gobject/ChangeLog index 30f3c0ed7..d301ca0e4 100644 --- a/gobject/ChangeLog +++ b/gobject/ChangeLog @@ -1,3 +1,8 @@ +Wed Feb 20 22:55:15 2002 Owen Taylor + + * gobject.c: Fix implicit conversions between void * and + function pointer (Miroslaw Dobrzanski-Neumann, #71963) + Sun Feb 16 22:08:48 2002 Tim Janik * gobject.[hc]: diff --git a/gobject/gobject.c b/gobject/gobject.c index 7836094de..2c0567039 100644 --- a/gobject/gobject.c +++ b/gobject/gobject.c @@ -1079,7 +1079,7 @@ g_object_connect (gpointer _object, va_start (var_args, signal_spec); while (signal_spec) { - gpointer callback = va_arg (var_args, gpointer); + GCallback callback = va_arg (var_args, GCallback); gpointer data = va_arg (var_args, gpointer); gulong sid; @@ -1141,7 +1141,7 @@ g_object_disconnect (gpointer _object, va_start (var_args, signal_spec); while (signal_spec) { - gpointer callback = va_arg (var_args, gpointer); + GCallback callback = va_arg (var_args, GCallback); gpointer data = va_arg (var_args, gpointer); guint sid = 0, detail = 0, mask = 0;