[libgdamm] Adapt to gmmproc m4 changes in glibmm.

[Murray Cumming <murrayc src gnome org>]

commit 1c4bd4697799ccd140887af9bb71872490a503fa
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Dec 9 16:49:44 2010 +0100

    Adapt to gmmproc m4 changes in glibmm.
    
    * tools/m4/convert.m4: Include convert_glibmm.m4 instead of convert_gtkmm.m4.
    * tools/m4/convert_libgdamm.m4: Avoid use of the __FR2P macro, which does
    not seem to be defined for some reason.

 ChangeLog                    |    8 ++++++++
 tools/m4/convert.m4          |    2 +-
 tools/m4/convert_libgdamm.m4 |    4 ++--
 3 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index ec4c1d7..628b5f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-12-09  Murray Cumming  <murrayc murrayc com>
+
+	Adapt to gmmproc m4 changes in glibmm.
+
+	* tools/m4/convert.m4: Include convert_glibmm.m4 instead of convert_gtkmm.m4.
+	* tools/m4/convert_libgdamm.m4: Avoid use of the __FR2P macro, which does 
+	not seem to be defined for some reason.
+
 4.1.1:
 
 2010-10-16  Murray Cumming  <murrayc murrayc com>
diff --git a/tools/m4/convert.m4 b/tools/m4/convert.m4
index 5d5d390..4c423eb 100644
--- a/tools/m4/convert.m4
+++ b/tools/m4/convert.m4
@@ -2,5 +2,5 @@ dnl $Id$
 
 # Override of the file of the same name in gtkmm.
 
-include(convert_gtkmm.m4)
+include(convert_glibmm.m4)
 include(convert_libgdamm.m4)
diff --git a/tools/m4/convert_libgdamm.m4 b/tools/m4/convert_libgdamm.m4
index 89c8f5f..603d272 100644
--- a/tools/m4/convert_libgdamm.m4
+++ b/tools/m4/convert_libgdamm.m4
@@ -133,9 +133,9 @@ _CONV_ENUM(Gda,SqlStatementType)
 _CONV_ENUM(Gda,SqlIdentifierStyle)
 
 # structs
-_CONVERSION(`Blob&',`GdaBlob*',__FR2P)
+_CONVERSION(`Blob&',`GdaBlob*',($3).gobj())
 _CONVERSION(`GdaBlob*',`Blob', Glib::wrap($3))
-_CONVERSION(`QuarkList&',`GdaQuarkList*',__FR2P)
+_CONVERSION(`QuarkList&',`GdaQuarkList*',($3).gobj())
 _CONVERSION(`GdaQuarkList*',`QuarkList', Glib::wrap($3))
 
 # Lists