[glibmm] Converter: Correct the "convert" virtual function.

[Josà Alburquerque <jaalburqu src gnome org>]

commit dfaacef0a1595dff7c158af79fda4ea2951e88fc
Author: Josà Alburquerque <jaalburqu svn gnome org>
Date:   Thu Sep 6 16:52:01 2012 -0400

    Converter: Correct the "convert" virtual function.
    
    	* gio/src/converter.hg (convert_vfunc): Have the virtual function
    	throw the final GError parameter of the C function instead of
    	including it in the C++ parameter list.  This is done by using the
    	recently added _WRAP_VFUNC functionality.

 ChangeLog            |   11 +++++++++++
 gio/src/converter.hg |    2 +-
 2 files changed, 12 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 8ffc8b1..ee9f96c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-09-06  Josà Alburquerque  <jaalburquerque gmail com>
+
+	Converter: Correct the "convert" virtual function.
+
+	* gio/src/converter.hg (convert_vfunc): Have the virtual function
+	throw the final GError parameter of the C function instead of
+	including it in the C++ parameter list.  This is done by using the
+	recently added _WRAP_VFUNC functionality.
+
 2012-09-05  Josà Alburquerque  <jaalburquerque gmail com>
 
 	gmmproc: _WRAP_VFUNC: Handle virtual functions that throw GErrors.
@@ -28,6 +37,8 @@
 	GError as a Glib::Error in the C++ virtual function when calling the
 	underlying C virtual function.
 
+	Bug #683460.
+
 2012-09-04  Josà Alburquerque  <jaalburquerque gmail com>
 
 	giomm: Add the ZlibDecompressor and the CharsetConverter classes.
diff --git a/gio/src/converter.hg b/gio/src/converter.hg
index c34d13d..fbd92be 100644
--- a/gio/src/converter.hg
+++ b/gio/src/converter.hg
@@ -51,7 +51,7 @@ public:
   _WRAP_METHOD(void reset(), g_converter_reset)
 
 #m4 _CONVERSION(`gsize*',`gsize&',`*($3)')
-  _WRAP_VFUNC(ConverterResult convert(const void* inbuf, gsize inbuf_size, void* outbuf, gsize outbuf_size, ConverterFlags flags, gsize& bytes_read, gsize& bytes_written, GError** error), "convert")
+  _WRAP_VFUNC(ConverterResult convert(const void* inbuf, gsize inbuf_size, void* outbuf, gsize outbuf_size, ConverterFlags flags, gsize& bytes_read, gsize& bytes_written), "convert", errthrow)
 
   _WRAP_VFUNC(void reset(), "reset")
 };