diff --git a/ChangeLog b/ChangeLog index 947957674..a2efbea9c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,9 @@ -2001-08-15 Ron Steinke +2001-08-16 Ron Steinke + + * glib/giounix.c: fixed an error in setting close_on_unref + in g_io_channel_new_file () + +2001-08-16 Ron Steinke * 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 947957674..a2efbea9c 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,4 +1,9 @@ -2001-08-15 Ron Steinke +2001-08-16 Ron Steinke + + * glib/giounix.c: fixed an error in setting close_on_unref + in g_io_channel_new_file () + +2001-08-16 Ron Steinke * 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 947957674..a2efbea9c 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,4 +1,9 @@ -2001-08-15 Ron Steinke +2001-08-16 Ron Steinke + + * glib/giounix.c: fixed an error in setting close_on_unref + in g_io_channel_new_file () + +2001-08-16 Ron Steinke * 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 947957674..a2efbea9c 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,4 +1,9 @@ -2001-08-15 Ron Steinke +2001-08-16 Ron Steinke + + * glib/giounix.c: fixed an error in setting close_on_unref + in g_io_channel_new_file () + +2001-08-16 Ron Steinke * 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 947957674..a2efbea9c 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,4 +1,9 @@ -2001-08-15 Ron Steinke +2001-08-16 Ron Steinke + + * glib/giounix.c: fixed an error in setting close_on_unref + in g_io_channel_new_file () + +2001-08-16 Ron Steinke * 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 947957674..a2efbea9c 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,4 +1,9 @@ -2001-08-15 Ron Steinke +2001-08-16 Ron Steinke + + * glib/giounix.c: fixed an error in setting close_on_unref + in g_io_channel_new_file () + +2001-08-16 Ron Steinke * 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 947957674..a2efbea9c 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,4 +1,9 @@ -2001-08-15 Ron Steinke +2001-08-16 Ron Steinke + + * glib/giounix.c: fixed an error in setting close_on_unref + in g_io_channel_new_file () + +2001-08-16 Ron Steinke * 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 947957674..a2efbea9c 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,4 +1,9 @@ -2001-08-15 Ron Steinke +2001-08-16 Ron Steinke + + * glib/giounix.c: fixed an error in setting close_on_unref + in g_io_channel_new_file () + +2001-08-16 Ron Steinke * 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 3cf12c7ac..67d4cc5ff 100644 --- 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;