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.

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.

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.

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.

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.

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.

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.

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.

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.

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

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()

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,
+ * Return value: A file handle (as from open()) to the file
- * the file descriptor to a file opened for reading and writing with
+ * opened for reading and writing. The file is opened in binary mode
- * g_mkstemp() is returned.
+ * 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,

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()

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,
+ * Return value: A file handle (as from open()) to the file
- * the file descriptor to a file opened for reading and writing with
+ * opened for reading and writing. The file is opened in binary mode
- * g_mkstemp() is returned.
+ * 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,

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().

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		\