dbusmm/tools/m4 convert.m4,1.1.1.1,1.2 convert_dbus.m4,1.1.1.1,1.2

[Murray Cumming]

Update of /cvs/dbus/dbusmm/tools/m4
In directory gabe:/tmp/cvs-serv5178/tools/m4

Modified Files:
	convert.m4 convert_dbus.m4 
Log Message:
2005-06-20  Murray Cumming <murrayc at murrayc.com>

        * dbus/src/connection.ccg:
        * dbus/src/proxy.ccg:
        * dbus/src/proxy.hg:
        * tools/m4/convert.m4:
        * tools/m4/convert_dbus.m4: Added Proxy, though
        it is currently impossible to wrap the constructors, and
        the signature-less callbacks need some thought.


Index: convert.m4
===================================================================
RCS file: /cvs/dbus/dbusmm/tools/m4/convert.m4,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- convert.m4	20 Jun 2005 07:11:41 -0000	1.1.1.1
+++ convert.m4	20 Jun 2005 08:10:42 -0000	1.2
@@ -2,5 +2,6 @@
 
 # Override of the file of the same name in gtkmm.
 
-include(convert_gtkmm.m4)
+include(convert_base.m4)
+include(convert_glib.m4)
 include(convert_dbus.m4)

Index: convert_dbus.m4
===================================================================
RCS file: /cvs/dbus/dbusmm/tools/m4/convert_dbus.m4,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- convert_dbus.m4	20 Jun 2005 07:11:41 -0000	1.1.1.1
+++ convert_dbus.m4	20 Jun 2005 08:10:42 -0000	1.2
@@ -28,7 +28,9 @@
 _CONVERSION(`int',`guint',($2)($3))
 _CONVERSION(`guint',`int',($2)($3))
 
-_CONVERSION(`DBusGConnection*', `Glib::RefPtr<Connection>', `Glib::wrap($3)')
+_CONVERSION(`DBusGConnection*', `Glib::RefPtr<Connection>', `Glib::wrap($3, true)')
+_CONVERSION(`const Glib::RefPtr<Connection>&', `DBusGConnection*', __CONVERT_REFPTR_TO_P)
+_CONVERSION(`const Glib::RefPtr<const Connection>&', `DBusGConnection*', __CONVERT_CONST_REFPTR_TO_P)
 
 dnl Enumeration and various typedef conversions:
 dnl --------------------------------------------