Fix implicit conversions between void * and function pointer (Miroslaw

Wed Feb 20 22:55:15 2002  Owen Taylor  <otaylor@redhat.com>

        * gobject.c: Fix implicit conversions between void * and
        function pointer (Miroslaw Dobrzanski-Neumann, #71963)

diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index 30f3c0ed70e97f27f9fff02a521f2d50b6566a29..d301ca0e47ee3f0a76d1e95862ee0142855e7571 100644 (file)
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,8 @@
+Wed Feb 20 22:55:15 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gobject.c: Fix implicit conversions between void * and 
+       function pointer (Miroslaw Dobrzanski-Neumann, #71963)
+
 Sun Feb 16 22:08:48 2002  Tim Janik  <timj@gtk.org>
 
        * gobject.[hc]:

diff --git a/gobject/gobject.c b/gobject/gobject.c
index 7836094de796ceb23813bb3d637f7d24b20e4845..2c0567039201ae8ad90190992713f781a52a97ff 100644 (file)
--- 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;