Up version to 1.3.2

Mon Nov 13 14:00:20 2000  Owen Taylor  <otaylor@redhat.com>

	* 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 4d0048487ec3e8c093eb14e4e7e45d08df8167dc..6010ac20e1adc9721fe2deab7ca2d9ba87715a4a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Mon Nov 13 14:00:20 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <tml@iki.fi>
 
        * config.h.win32.in: Add USE_LIBICONV.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 4d0048487ec3e8c093eb14e4e7e45d08df8167dc..6010ac20e1adc9721fe2deab7ca2d9ba87715a4a 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,12 @@
+Mon Nov 13 14:00:20 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <tml@iki.fi>
 
        * config.h.win32.in: Add USE_LIBICONV.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4d0048487ec3e8c093eb14e4e7e45d08df8167dc..6010ac20e1adc9721fe2deab7ca2d9ba87715a4a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+Mon Nov 13 14:00:20 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <tml@iki.fi>
 
        * config.h.win32.in: Add USE_LIBICONV.

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 4d0048487ec3e8c093eb14e4e7e45d08df8167dc..6010ac20e1adc9721fe2deab7ca2d9ba87715a4a 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,12 @@
+Mon Nov 13 14:00:20 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <tml@iki.fi>
 
        * config.h.win32.in: Add USE_LIBICONV.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 4d0048487ec3e8c093eb14e4e7e45d08df8167dc..6010ac20e1adc9721fe2deab7ca2d9ba87715a4a 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,12 @@
+Mon Nov 13 14:00:20 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <tml@iki.fi>
 
        * config.h.win32.in: Add USE_LIBICONV.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 4d0048487ec3e8c093eb14e4e7e45d08df8167dc..6010ac20e1adc9721fe2deab7ca2d9ba87715a4a 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,12 @@
+Mon Nov 13 14:00:20 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <tml@iki.fi>
 
        * config.h.win32.in: Add USE_LIBICONV.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 4d0048487ec3e8c093eb14e4e7e45d08df8167dc..6010ac20e1adc9721fe2deab7ca2d9ba87715a4a 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+Mon Nov 13 14:00:20 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <tml@iki.fi>
 
        * config.h.win32.in: Add USE_LIBICONV.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 4d0048487ec3e8c093eb14e4e7e45d08df8167dc..6010ac20e1adc9721fe2deab7ca2d9ba87715a4a 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+Mon Nov 13 14:00:20 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <tml@iki.fi>
 
        * config.h.win32.in: Add USE_LIBICONV.

diff --git a/configure.in b/configure.in
index d268ca2999986f8fbaa4845209707f192abb586c..f3502dffe0f1f2cd3b078228d599d47638a09474 100644 (file)
--- 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 b2e959226cd16672083161f850b28e5ff75873c8..ce19b36722b5b8b18e00aeca421c94b3293562ef 100644 (file)
--- 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 e1a870b9d2de50b16486711e5df516621318a57a..47c2ef68a00cf71a237c4fcafa10e54e6496b521 100644 (file)
--- 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 b2e959226cd16672083161f850b28e5ff75873c8..ce19b36722b5b8b18e00aeca421c94b3293562ef 100644 (file)
--- 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 e1a870b9d2de50b16486711e5df516621318a57a..47c2ef68a00cf71a237c4fcafa10e54e6496b521 100644 (file)
--- 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 209bf7f3db02aa463bf2d221089d2a9e6b58b595..cf3886f7be12507d203bf166b81ec198dc3554c7 100644 (file)
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,7 @@
+Mon Nov 13 00:48:39 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * Makefile.am (EXTRA_DIST): Add glib-genmarshal.1
+
 2000-11-11  Tor Lillqvist  <tml@iki.fi>
 
        * gtypemodule.c: Include stdlib.h for exit().

diff --git a/gobject/Makefile.am b/gobject/Makefile.am
index 44f7b472071ec496700b89940b3e232670c446b4..6296bce3187be94b2b573db72628e68c7d6e95bc 100644 (file)
--- 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          \