+Mon May 20 18:02:46 2002 Owen Taylor <otaylor@redhat.com>
+
+ * configure.in: Move iconv tests before gettext
+ checks. (#81999)
+
+ * m4macros/glib-gettext.m4 acinclude.m4: If we can't
+ link to gettext, try adding in -liconv. (#80076,
+ Boyd Lynn Gerber)
+
+ * m4macros/glib-gettext.m4 acinclude.m4: Suppress
+ warnings about xgettext not being GNU gettext when
+ libintl wasn't found at all.
+ (#79016, Andrew P. Lentvorski, Jr.)
+
+2002-05-21 Matthias Clasen <maclas@gmx.de>
+
+ * glib/gmarkup.c (g_markup_parse_context_parse): Added
+ proper support for CDATA sections.
+
+2002-05-20 jacob berkman <jacob@ximian.com>
+
+ * glib/gdir.c: include sys/types.h before dirent.h to build on
+ darwin (fixes #72859)
+
+Mon May 20 15:35:59 2002 Owen Taylor <otaylor@redhat.com>
+
+ * glib/gfileutils.c (get_contents_regfile): Fix double
+ close of file descriptor on error. (#82139, Wayne Schuller)
+
+ * glib/gspawn.c (close_and_invalidate): Don't close
+ fd's that have already been closed. (Fix from Michael
+ Meeks, #81959)
+
+ * glib/giochannel.c (g_io_channel_close): If not flushing,
+ dump the contents of the write buffers, so we won't try
+ to write them to an invalid fd later. (Patch from Ron Steinke,
+ fixing #78290, Andreas Persenius.)
+
+2002-05-18 Matthias Clasen <maclas@gmx.de>
+
+ * tests/markups/fail-36.gmarkup:
+ * tests/markups/fail-35.gmarkup:
+ * tests/markups/valid-8.gmarkup:
+ * tests/markups/valid-7.gmarkup:
+ * tests/markups/valid-6.gmarkup:
+ * tests/markups/valid-5.gmarkup: New testcases.
+
+ * tests/markup-test.c (passthrough_handler):
+ (text_handler): Don't ignore the text_len parameter.
+
+ * glib/gmarkup.c (find_current_text_end): Don't hang on embedded
+ nuls. (#81977)
+ (g_markup_parse_context_parse): Fix passthrough handling to
+ correctly skip processing instructions, comments, doctype
+ declarations and CDATA marked sections. (#81977)
+
+Sat May 18 00:21:51 2002 Tim Janik <timj@gtk.org>
+
+ [merged from stable]
+
+ * glib/gscanner.c (g_scanner_unexp_token): fix missing cases for
+ expected_token.
+
+2002-05-17 Tor Lillqvist <tml@iki.fi>
+
+ * config.h.win32.in: Match new additions in a configure-produced
+ config.h.
+
+ * glibconfig.h.win32.in: gssize and gsize as in a
+ configure-produced glibconfig.h.
+
+ * glib/glib.def: Add new functions.
+
Thu May 16 12:24:00 2002 Owen Taylor <otaylor@redhat.com>
* acinclude.m4 m4macros/glib-gettext.m4: Incorporate