[glibmm] Added VariantType

[Murray Cumming <murrayc src gnome org>]

commit 9efd91ed4735a4f073c04df22860a1aaa312716b
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Jul 29 00:26:57 2010 +0200

    Added VariantType
    
    * glib/src/filelist.am:
    * glib/src/varianttype.[hg|ccg]: Added VariantType, though
    we still need to wrap the _new_*() functions as create_*().
    * tools/m4/convert_glib.m4: Added necessary conversions.

 ChangeLog                |    9 +++++++++
 glib/src/filelist.am     |    3 ++-
 glib/src/variant.hg      |    1 +
 tools/m4/convert_glib.m4 |    3 +++
 4 files changed, 15 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 39caa4f..c67dc30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-07-29  Murray Cumming  <murrayc murrayc-x61>
+
+	Added VariantType
+
+	* glib/src/filelist.am:
+	* glib/src/varianttype.[hg|ccg]: Added VariantType, though 
+	we still need to wrap the _new_*() functions as create_*().
+	* tools/m4/convert_glib.m4: Added necessary conversions.
+
 2010-07-28   Martin Braure de Calignon  <braurede free fr>
 
 	giomm: DBusConnection: Added send_message_with_reply().
diff --git a/glib/src/filelist.am b/glib/src/filelist.am
index 3e56249..d46ffff 100644
--- a/glib/src/filelist.am
+++ b/glib/src/filelist.am
@@ -33,7 +33,8 @@ glibmm_files_hg =		\
 	unicode.hg		\
 	uriutils.hg		\
 	valuearray.hg		\
-	variant.hg
+	variant.hg \
+	varianttype.hg
 
 glibmm_files_ccg = $(glibmm_files_hg:.hg=.ccg)
 
diff --git a/glib/src/variant.hg b/glib/src/variant.hg
index 6f45b6b..e04f52a 100644
--- a/glib/src/variant.hg
+++ b/glib/src/variant.hg
@@ -62,6 +62,7 @@ public:
   _WRAP_METHOD(guint hash() const, g_variant_hash)
   _WRAP_METHOD(bool equal(const VariantBase& other) const, g_variant_equal)
 
+  //TODO: Use VariantBase as an output parameter:
   _WRAP_METHOD(VariantBase get_normal_form() const, g_variant_get_normal_form)
   _WRAP_METHOD(bool is_normal_form() const, g_variant_is_normal_form)
   _WRAP_METHOD(VariantBase byteswap() const, g_variant_byteswap)
diff --git a/tools/m4/convert_glib.m4 b/tools/m4/convert_glib.m4
index 5bde0bb..b704106 100644
--- a/tools/m4/convert_glib.m4
+++ b/tools/m4/convert_glib.m4
@@ -79,3 +79,6 @@ _CONVERSION(`OptionGroup&',`GOptionGroup*',`($3).gobj()')
 #_CONVERSION(`GOptionGroup*',`OptionGroup',`Glib::wrap(($3), true /* take_copy */)')
 
 _CONVERSION(`Glib::KeyFile&',`GKeyFile*',`($3).gobj()')
+
+_CONVERSION(`const VariantType&',`const GVariantType*',`($3).gobj()')
+_CONVERSION(`const GVariantType*',`VariantType',`Glib::wrap(const_cast<GVariantType*>($3), true)')