removed wrap_g_io_channel_ref() hack, since g_io_channel_ref() has a

Mon Nov  8 10:47:41 2004  Manish Singh  <yosh@gimp.org>

        * gobject/gsourceclosure.c: removed wrap_g_io_channel_ref() hack,
        since g_io_channel_ref() has a compatible API now.

diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index 71bffbe..6876446 100644 (file)
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,8 @@
+Mon Nov  8 10:47:41 2004  Manish Singh  <yosh@gimp.org>
+
+       * gobject/gsourceclosure.c: removed wrap_g_io_channel_ref() hack,
+       since g_io_channel_ref() has a compatible API now.
+
 2004-11-02  Matthias Clasen  <mclasen@redhat.com>
 
        * === Released 2.5.5 ===

diff --git a/gobject/gsourceclosure.c b/gobject/gsourceclosure.c
index 7ff1680..a733deb 100644 (file)
--- a/gobject/gsourceclosure.c
+++ b/gobject/gsourceclosure.c
@@ -25,16 +25,6 @@
 #include "gvalue.h"
 #include "gvaluetypes.h"
 
-/* This is needed for a proper GBoxedCopyFunc, until the g_io_channel_ref API
- * returns it's GIOChannel itself #131076.
- */
-static GIOChannel *
-wrap_g_io_channel_ref (GIOChannel *channel)
-{
-  g_io_channel_ref (channel);
-  return channel;
-}
-
 GType
 g_io_channel_get_type (void)
 {
@@ -42,7 +32,7 @@ g_io_channel_get_type (void)
   
   if (our_type == 0)
     our_type = g_boxed_type_register_static ("GIOChannel",
-                                            (GBoxedCopyFunc) wrap_g_io_channel_ref,
+                                            (GBoxedCopyFunc) g_io_channel_ref,
                                             (GBoxedFreeFunc) g_io_channel_unref);
 
   return our_type;