Modified Files: glib/ChangeLog glib/glib/giounix.c

Modified Files:
	glib/ChangeLog glib/glib/giounix.c

        * glib/giounix.c: fixed an error in setting close_on_unref
        in g_io_channel_new_file ()

diff --git a/ChangeLog b/ChangeLog
index 9479576745f81e9b4cc66e25d563488c4d1f7c2a..a2efbea9c3c76e44f2be3f6bfd0cb1d39393137a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-2001-08-15  Ron Steinke  <rsteinke@w-link.net>
+2001-08-16  Ron Steinke  <rsteinke@w-link.net>
+
+       * glib/giounix.c: fixed an error in setting close_on_unref
+       in g_io_channel_new_file ()
+
+2001-08-16  Ron Steinke  <rsteinke@w-link.net>
 
        * glib/giochannel.c glib/glib.def glib/giochannel.h: Added
        new functions g_io_channel_[set,get]_close_on_unref ()

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 9479576745f81e9b4cc66e25d563488c4d1f7c2a..a2efbea9c3c76e44f2be3f6bfd0cb1d39393137a 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,4 +1,9 @@
-2001-08-15  Ron Steinke  <rsteinke@w-link.net>
+2001-08-16  Ron Steinke  <rsteinke@w-link.net>
+
+       * glib/giounix.c: fixed an error in setting close_on_unref
+       in g_io_channel_new_file ()
+
+2001-08-16  Ron Steinke  <rsteinke@w-link.net>
 
        * glib/giochannel.c glib/glib.def glib/giochannel.h: Added
        new functions g_io_channel_[set,get]_close_on_unref ()

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9479576745f81e9b4cc66e25d563488c4d1f7c2a..a2efbea9c3c76e44f2be3f6bfd0cb1d39393137a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,4 +1,9 @@
-2001-08-15  Ron Steinke  <rsteinke@w-link.net>
+2001-08-16  Ron Steinke  <rsteinke@w-link.net>
+
+       * glib/giounix.c: fixed an error in setting close_on_unref
+       in g_io_channel_new_file ()
+
+2001-08-16  Ron Steinke  <rsteinke@w-link.net>
 
        * glib/giochannel.c glib/glib.def glib/giochannel.h: Added
        new functions g_io_channel_[set,get]_close_on_unref ()

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 9479576745f81e9b4cc66e25d563488c4d1f7c2a..a2efbea9c3c76e44f2be3f6bfd0cb1d39393137a 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,4 +1,9 @@
-2001-08-15  Ron Steinke  <rsteinke@w-link.net>
+2001-08-16  Ron Steinke  <rsteinke@w-link.net>
+
+       * glib/giounix.c: fixed an error in setting close_on_unref
+       in g_io_channel_new_file ()
+
+2001-08-16  Ron Steinke  <rsteinke@w-link.net>
 
        * glib/giochannel.c glib/glib.def glib/giochannel.h: Added
        new functions g_io_channel_[set,get]_close_on_unref ()

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 9479576745f81e9b4cc66e25d563488c4d1f7c2a..a2efbea9c3c76e44f2be3f6bfd0cb1d39393137a 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,4 +1,9 @@
-2001-08-15  Ron Steinke  <rsteinke@w-link.net>
+2001-08-16  Ron Steinke  <rsteinke@w-link.net>
+
+       * glib/giounix.c: fixed an error in setting close_on_unref
+       in g_io_channel_new_file ()
+
+2001-08-16  Ron Steinke  <rsteinke@w-link.net>
 
        * glib/giochannel.c glib/glib.def glib/giochannel.h: Added
        new functions g_io_channel_[set,get]_close_on_unref ()

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 9479576745f81e9b4cc66e25d563488c4d1f7c2a..a2efbea9c3c76e44f2be3f6bfd0cb1d39393137a 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,4 +1,9 @@
-2001-08-15  Ron Steinke  <rsteinke@w-link.net>
+2001-08-16  Ron Steinke  <rsteinke@w-link.net>
+
+       * glib/giounix.c: fixed an error in setting close_on_unref
+       in g_io_channel_new_file ()
+
+2001-08-16  Ron Steinke  <rsteinke@w-link.net>
 
        * glib/giochannel.c glib/glib.def glib/giochannel.h: Added
        new functions g_io_channel_[set,get]_close_on_unref ()

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9479576745f81e9b4cc66e25d563488c4d1f7c2a..a2efbea9c3c76e44f2be3f6bfd0cb1d39393137a 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,4 +1,9 @@
-2001-08-15  Ron Steinke  <rsteinke@w-link.net>
+2001-08-16  Ron Steinke  <rsteinke@w-link.net>
+
+       * glib/giounix.c: fixed an error in setting close_on_unref
+       in g_io_channel_new_file ()
+
+2001-08-16  Ron Steinke  <rsteinke@w-link.net>
 
        * glib/giochannel.c glib/glib.def glib/giochannel.h: Added
        new functions g_io_channel_[set,get]_close_on_unref ()

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9479576745f81e9b4cc66e25d563488c4d1f7c2a..a2efbea9c3c76e44f2be3f6bfd0cb1d39393137a 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,4 +1,9 @@
-2001-08-15  Ron Steinke  <rsteinke@w-link.net>
+2001-08-16  Ron Steinke  <rsteinke@w-link.net>
+
+       * glib/giounix.c: fixed an error in setting close_on_unref
+       in g_io_channel_new_file ()
+
+2001-08-16  Ron Steinke  <rsteinke@w-link.net>
 
        * glib/giochannel.c glib/glib.def glib/giochannel.h: Added
        new functions g_io_channel_[set,get]_close_on_unref ()

diff --git a/glib/giounix.c b/glib/giounix.c
index 3cf12c7ac5803dc399ab4b3b86e14eca70cb0ad8..67d4cc5fff7aec96b3d3791193e72a92fc25b6b0 100644 (file)
--- a/glib/giounix.c
+++ b/glib/giounix.c
@@ -514,7 +514,6 @@ g_io_channel_new_file (const gchar *filename,
 
   channel = (GIOChannel *) g_new (GIOUnixChannel, 1);
 
-  channel->close_on_unref = TRUE;
   channel->is_seekable = S_ISREG (buffer.st_mode) || S_ISCHR (buffer.st_mode)
                          || S_ISBLK (buffer.st_mode);
 
@@ -540,6 +539,7 @@ g_io_channel_new_file (const gchar *filename,
     }
 
   g_io_channel_init (channel);
+  channel->close_on_unref = TRUE; /* must be after g_io_channel_init () */
   channel->funcs = &unix_channel_funcs;
 
   ((GIOUnixChannel *) channel)->fd = fid;