Fixed small bug.

1998-12-16  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>

	* giounix.c (g_io_channel_unix_get_fd): Fixed small bug.

diff --git a/ChangeLog b/ChangeLog
index c9e057fcd644e234737a2d614d93e368fe4afb47..323c0a273d83b3fa96ab310493638f22486caaf2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1998-12-16  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * giounix.c (g_io_channel_unix_get_fd): Fixed small bug.
+
 1998-12-16  Joel Becker  <jlbec@ocala.cs.miami.edu>
 
        * glib.h, gscanner.c: changed func_data to user_data in

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index c9e057fcd644e234737a2d614d93e368fe4afb47..323c0a273d83b3fa96ab310493638f22486caaf2 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,7 @@
+1998-12-16  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * giounix.c (g_io_channel_unix_get_fd): Fixed small bug.
+
 1998-12-16  Joel Becker  <jlbec@ocala.cs.miami.edu>
 
        * glib.h, gscanner.c: changed func_data to user_data in

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c9e057fcd644e234737a2d614d93e368fe4afb47..323c0a273d83b3fa96ab310493638f22486caaf2 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+1998-12-16  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * giounix.c (g_io_channel_unix_get_fd): Fixed small bug.
+
 1998-12-16  Joel Becker  <jlbec@ocala.cs.miami.edu>
 
        * glib.h, gscanner.c: changed func_data to user_data in

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index c9e057fcd644e234737a2d614d93e368fe4afb47..323c0a273d83b3fa96ab310493638f22486caaf2 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,7 @@
+1998-12-16  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * giounix.c (g_io_channel_unix_get_fd): Fixed small bug.
+
 1998-12-16  Joel Becker  <jlbec@ocala.cs.miami.edu>
 
        * glib.h, gscanner.c: changed func_data to user_data in

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index c9e057fcd644e234737a2d614d93e368fe4afb47..323c0a273d83b3fa96ab310493638f22486caaf2 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,7 @@
+1998-12-16  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * giounix.c (g_io_channel_unix_get_fd): Fixed small bug.
+
 1998-12-16  Joel Becker  <jlbec@ocala.cs.miami.edu>
 
        * glib.h, gscanner.c: changed func_data to user_data in

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index c9e057fcd644e234737a2d614d93e368fe4afb47..323c0a273d83b3fa96ab310493638f22486caaf2 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+1998-12-16  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * giounix.c (g_io_channel_unix_get_fd): Fixed small bug.
+
 1998-12-16  Joel Becker  <jlbec@ocala.cs.miami.edu>
 
        * glib.h, gscanner.c: changed func_data to user_data in

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c9e057fcd644e234737a2d614d93e368fe4afb47..323c0a273d83b3fa96ab310493638f22486caaf2 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+1998-12-16  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * giounix.c (g_io_channel_unix_get_fd): Fixed small bug.
+
 1998-12-16  Joel Becker  <jlbec@ocala.cs.miami.edu>
 
        * glib.h, gscanner.c: changed func_data to user_data in

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c9e057fcd644e234737a2d614d93e368fe4afb47..323c0a273d83b3fa96ab310493638f22486caaf2 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+1998-12-16  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * giounix.c (g_io_channel_unix_get_fd): Fixed small bug.
+
 1998-12-16  Joel Becker  <jlbec@ocala.cs.miami.edu>
 
        * glib.h, gscanner.c: changed func_data to user_data in

diff --git a/giounix.c b/giounix.c
index 23fc69f0e96fafab2c28e2490ed8542f2a9f4d09..72239c7152239c8832f1a4b5c0af2ce3799c11e3 100644 (file)
--- a/giounix.c
+++ b/giounix.c
@@ -297,6 +297,6 @@ g_io_channel_unix_new (gint fd)
 gint
 g_io_channel_unix_get_fd (GIOChannel *channel)
 {
-  GIOUnixChannel *unix_channel = g_new (GIOUnixChannel, 1);
+  GIOUnixChannel *unix_channel = (GIOUnixChannel *)channel;
   return unix_channel->fd;
 }

diff --git a/glib/giounix.c b/glib/giounix.c
index 23fc69f0e96fafab2c28e2490ed8542f2a9f4d09..72239c7152239c8832f1a4b5c0af2ce3799c11e3 100644 (file)
--- a/glib/giounix.c
+++ b/glib/giounix.c
@@ -297,6 +297,6 @@ g_io_channel_unix_new (gint fd)
 gint
 g_io_channel_unix_get_fd (GIOChannel *channel)
 {
-  GIOUnixChannel *unix_channel = g_new (GIOUnixChannel, 1);
+  GIOUnixChannel *unix_channel = (GIOUnixChannel *)channel;
   return unix_channel->fd;
 }