Modified Files: glib/ChangeLog glib/glib/giochannel.h

Modified Files:
 	glib/ChangeLog glib/glib/giochannel.h

        * glib/giochannel.h: Committed this file, which is where
        the changes in my previous changelog entry happened,
        not giochannel.c
This commit is contained in:
Ron Steinke 2001-07-31 23:12:22 +00:00
parent 8800b2542b
commit 272046d952
9 changed files with 63 additions and 4 deletions

View File

@ -1,3 +1,9 @@
2001-07-31 Ron Steinke <rsteinke@w-link.net>
* glib/giochannel.h: Committed this file, which is where
the changes in my previous changelog entry happened,
not giochannel.c
2001-07-31 Sven Neumann <sven@gimp.org>
* glib/gmem.c: declare gboolean vtable_set static.

View File

@ -1,3 +1,9 @@
2001-07-31 Ron Steinke <rsteinke@w-link.net>
* glib/giochannel.h: Committed this file, which is where
the changes in my previous changelog entry happened,
not giochannel.c
2001-07-31 Sven Neumann <sven@gimp.org>
* glib/gmem.c: declare gboolean vtable_set static.

View File

@ -1,3 +1,9 @@
2001-07-31 Ron Steinke <rsteinke@w-link.net>
* glib/giochannel.h: Committed this file, which is where
the changes in my previous changelog entry happened,
not giochannel.c
2001-07-31 Sven Neumann <sven@gimp.org>
* glib/gmem.c: declare gboolean vtable_set static.

View File

@ -1,3 +1,9 @@
2001-07-31 Ron Steinke <rsteinke@w-link.net>
* glib/giochannel.h: Committed this file, which is where
the changes in my previous changelog entry happened,
not giochannel.c
2001-07-31 Sven Neumann <sven@gimp.org>
* glib/gmem.c: declare gboolean vtable_set static.

View File

@ -1,3 +1,9 @@
2001-07-31 Ron Steinke <rsteinke@w-link.net>
* glib/giochannel.h: Committed this file, which is where
the changes in my previous changelog entry happened,
not giochannel.c
2001-07-31 Sven Neumann <sven@gimp.org>
* glib/gmem.c: declare gboolean vtable_set static.

View File

@ -1,3 +1,9 @@
2001-07-31 Ron Steinke <rsteinke@w-link.net>
* glib/giochannel.h: Committed this file, which is where
the changes in my previous changelog entry happened,
not giochannel.c
2001-07-31 Sven Neumann <sven@gimp.org>
* glib/gmem.c: declare gboolean vtable_set static.

View File

@ -1,3 +1,9 @@
2001-07-31 Ron Steinke <rsteinke@w-link.net>
* glib/giochannel.h: Committed this file, which is where
the changes in my previous changelog entry happened,
not giochannel.c
2001-07-31 Sven Neumann <sven@gimp.org>
* glib/gmem.c: declare gboolean vtable_set static.

View File

@ -1,3 +1,9 @@
2001-07-31 Ron Steinke <rsteinke@w-link.net>
* glib/giochannel.h: Committed this file, which is where
the changes in my previous changelog entry happened,
not giochannel.c
2001-07-31 Sven Neumann <sven@gimp.org>
* glib/gmem.c: declare gboolean vtable_set static.

View File

@ -91,10 +91,6 @@ typedef enum
G_IO_NVAL GLIB_SYSDEF_POLLNVAL
} GIOCondition;
#define G_IO_CHANNEL_UNIX_LINE_TERM "\n"
#define G_IO_CHANNEL_DOS_LINE_TERM "\r\n"
#define G_IO_CHANNEL_MACINTOSH_LINE_TERM "\r"
typedef enum
{
G_IO_FLAG_APPEND = 1 << 0,
@ -109,6 +105,8 @@ typedef enum
struct _GIOChannel
{
/*<private>*/
guint ref_count;
GIOFuncs *funcs;
@ -127,7 +125,20 @@ struct _GIOChannel
gboolean use_buffer : 1; /* The encoding uses the buffers */
gboolean do_encode : 1; /* The encoding uses the GIConv coverters */
/*<public>*/
gboolean close_on_unref : 1; /* Close the channel on final unref */
/* The is_readable and is_writeable flags should really be marked
* <protected> instead of <private>. Some applications of GIOChannel,
* like GNet which implements the unix shutdown function to partially
* or completely disconnect sockets, may need to set these. For most
* cases, people won't need to touch them.
*/
/*<private>*/
gboolean is_readable : 1; /* Cached GIOFlag */
gboolean is_writeable : 1; /* ditto */
gboolean is_seekable : 1; /* ditto */