From: Owen Taylor Date: Mon, 13 Nov 2000 19:01:28 +0000 (+0000) Subject: Up version to 1.3.2 X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=b1376c12d9074db95003f2673f53036b571b52e9;p=dana%2Fcg-glib.git Up version to 1.3.2 Mon Nov 13 14:00:20 2000 Owen Taylor * configure.in: Up version to 1.3.2 * gconvert.h (enum GConvertError): Remove trailing , * gfileutils.c (g_file_open_tmp): Fix comment to properly describe return value. --- diff --git a/ChangeLog b/ChangeLog index 4d004848..6010ac20 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Mon Nov 13 14:00:20 2000 Owen Taylor + + * configure.in: Up version to 1.3.2 + + * gconvert.h (enum GConvertError): Remove trailing , + + * gfileutils.c (g_file_open_tmp): Fix comment to + properly describe return value. + 2000-11-13 Tor Lillqvist * config.h.win32.in: Add USE_LIBICONV. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 4d004848..6010ac20 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,12 @@ +Mon Nov 13 14:00:20 2000 Owen Taylor + + * configure.in: Up version to 1.3.2 + + * gconvert.h (enum GConvertError): Remove trailing , + + * gfileutils.c (g_file_open_tmp): Fix comment to + properly describe return value. + 2000-11-13 Tor Lillqvist * config.h.win32.in: Add USE_LIBICONV. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 4d004848..6010ac20 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +Mon Nov 13 14:00:20 2000 Owen Taylor + + * configure.in: Up version to 1.3.2 + + * gconvert.h (enum GConvertError): Remove trailing , + + * gfileutils.c (g_file_open_tmp): Fix comment to + properly describe return value. + 2000-11-13 Tor Lillqvist * config.h.win32.in: Add USE_LIBICONV. diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 4d004848..6010ac20 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,12 @@ +Mon Nov 13 14:00:20 2000 Owen Taylor + + * configure.in: Up version to 1.3.2 + + * gconvert.h (enum GConvertError): Remove trailing , + + * gfileutils.c (g_file_open_tmp): Fix comment to + properly describe return value. + 2000-11-13 Tor Lillqvist * config.h.win32.in: Add USE_LIBICONV. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 4d004848..6010ac20 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,12 @@ +Mon Nov 13 14:00:20 2000 Owen Taylor + + * configure.in: Up version to 1.3.2 + + * gconvert.h (enum GConvertError): Remove trailing , + + * gfileutils.c (g_file_open_tmp): Fix comment to + properly describe return value. + 2000-11-13 Tor Lillqvist * config.h.win32.in: Add USE_LIBICONV. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 4d004848..6010ac20 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,12 @@ +Mon Nov 13 14:00:20 2000 Owen Taylor + + * configure.in: Up version to 1.3.2 + + * gconvert.h (enum GConvertError): Remove trailing , + + * gfileutils.c (g_file_open_tmp): Fix comment to + properly describe return value. + 2000-11-13 Tor Lillqvist * config.h.win32.in: Add USE_LIBICONV. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 4d004848..6010ac20 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +Mon Nov 13 14:00:20 2000 Owen Taylor + + * configure.in: Up version to 1.3.2 + + * gconvert.h (enum GConvertError): Remove trailing , + + * gfileutils.c (g_file_open_tmp): Fix comment to + properly describe return value. + 2000-11-13 Tor Lillqvist * config.h.win32.in: Add USE_LIBICONV. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 4d004848..6010ac20 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +Mon Nov 13 14:00:20 2000 Owen Taylor + + * configure.in: Up version to 1.3.2 + + * gconvert.h (enum GConvertError): Remove trailing , + + * gfileutils.c (g_file_open_tmp): Fix comment to + properly describe return value. + 2000-11-13 Tor Lillqvist * config.h.win32.in: Add USE_LIBICONV. diff --git a/configure.in b/configure.in index d268ca29..f3502dff 100644 --- a/configure.in +++ b/configure.in @@ -31,7 +31,7 @@ GLIB_DIVERT_BEFORE_HELP([ # GLIB_MAJOR_VERSION=1 GLIB_MINOR_VERSION=3 -GLIB_MICRO_VERSION=1 +GLIB_MICRO_VERSION=2 GLIB_INTERFACE_AGE=0 GLIB_BINARY_AGE=0 GLIB_VERSION=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION.$GLIB_MICRO_VERSION diff --git a/gconvert.h b/gconvert.h index b2e95922..ce19b367 100644 --- a/gconvert.h +++ b/gconvert.h @@ -37,7 +37,7 @@ typedef enum G_CONVERT_ERROR_NO_CONVERSION, G_CONVERT_ERROR_ILLEGAL_SEQUENCE, G_CONVERT_ERROR_FAILED, - G_CONVERT_ERROR_PARTIAL_INPUT, + G_CONVERT_ERROR_PARTIAL_INPUT } GConvertError; #define G_CONVERT_ERROR g_convert_error_quark() diff --git a/gfileutils.c b/gfileutils.c index e1a870b9..47c2ef68 100644 --- a/gfileutils.c +++ b/gfileutils.c @@ -522,7 +522,6 @@ g_file_get_contents (const gchar *filename, * opened for reading and writing. The file is opened in binary mode * on platforms where there is a difference. The file handle should be * closed with close(). In case of errors, -1 is returned. - * */ int g_mkstemp (char *tmpl) @@ -605,9 +604,11 @@ g_mkstemp (char *tmpl) * The actual name used is returned in @name_used if non-NULL. This * string should be freed with g_free when not needed any longer. * - * If some error occurs, @error is set, and -1 is returned. Otherwise, - * the file descriptor to a file opened for reading and writing with - * g_mkstemp() is returned. + * Return value: A file handle (as from open()) to the file + * opened for reading and writing. The file is opened in binary mode + * on platforms where there is a difference. The file handle should be + * closed with close(). In case of errors, -1 is returned and + * @error will be set. **/ int g_file_open_tmp (const char *tmpl, diff --git a/glib/gconvert.h b/glib/gconvert.h index b2e95922..ce19b367 100644 --- a/glib/gconvert.h +++ b/glib/gconvert.h @@ -37,7 +37,7 @@ typedef enum G_CONVERT_ERROR_NO_CONVERSION, G_CONVERT_ERROR_ILLEGAL_SEQUENCE, G_CONVERT_ERROR_FAILED, - G_CONVERT_ERROR_PARTIAL_INPUT, + G_CONVERT_ERROR_PARTIAL_INPUT } GConvertError; #define G_CONVERT_ERROR g_convert_error_quark() diff --git a/glib/gfileutils.c b/glib/gfileutils.c index e1a870b9..47c2ef68 100644 --- a/glib/gfileutils.c +++ b/glib/gfileutils.c @@ -522,7 +522,6 @@ g_file_get_contents (const gchar *filename, * opened for reading and writing. The file is opened in binary mode * on platforms where there is a difference. The file handle should be * closed with close(). In case of errors, -1 is returned. - * */ int g_mkstemp (char *tmpl) @@ -605,9 +604,11 @@ g_mkstemp (char *tmpl) * The actual name used is returned in @name_used if non-NULL. This * string should be freed with g_free when not needed any longer. * - * If some error occurs, @error is set, and -1 is returned. Otherwise, - * the file descriptor to a file opened for reading and writing with - * g_mkstemp() is returned. + * Return value: A file handle (as from open()) to the file + * opened for reading and writing. The file is opened in binary mode + * on platforms where there is a difference. The file handle should be + * closed with close(). In case of errors, -1 is returned and + * @error will be set. **/ int g_file_open_tmp (const char *tmpl, diff --git a/gobject/ChangeLog b/gobject/ChangeLog index 209bf7f3..cf3886f7 100644 --- a/gobject/ChangeLog +++ b/gobject/ChangeLog @@ -1,3 +1,7 @@ +Mon Nov 13 00:48:39 2000 Owen Taylor + + * Makefile.am (EXTRA_DIST): Add glib-genmarshal.1 + 2000-11-11 Tor Lillqvist * gtypemodule.c: Include stdlib.h for exit(). diff --git a/gobject/Makefile.am b/gobject/Makefile.am index 44f7b472..6296bce3 100644 --- a/gobject/Makefile.am +++ b/gobject/Makefile.am @@ -101,7 +101,8 @@ EXTRA_DIST += \ makefile.mingw.in \ makefile.msc.in \ gobject.def \ - gobject.rc.in + gobject.rc.in \ + glib-genmarshal.1 BUILT_EXTRA_DIST = \ makefile.mingw \