[glibmm] TlsInteraction: Add certificate request methods.

[Murray Cumming <murrayc src gnome org>]

commit 95c35becd45168f1f9325eb800f06ea888993e96
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Apr 4 21:51:38 2014 +0200

    TlsInteraction: Add certificate request methods.
    
    * gio/src/tlsinteraction.hg: Add invoke_request_certificate(),
      request_certificate(), request_certificate_async() and
      request_certificate_finish().

 gio/src/tlsinteraction.hg |   13 +++++++++++++
 tools/m4/convert_gio.m4   |   10 +++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)
---
diff --git a/gio/src/tlsinteraction.hg b/gio/src/tlsinteraction.hg
index 37ad491..37abbbc 100644
--- a/gio/src/tlsinteraction.hg
+++ b/gio/src/tlsinteraction.hg
@@ -17,6 +17,7 @@
 
 #include <glibmm/object.h>
 #include <giomm/asyncresult.h>
+#include <giomm/tlsconnection.h>
 
 _DEFS(giomm,gio)
 _PINCLUDE(glibmm/private/object_p.h)
@@ -26,6 +27,7 @@ namespace Gio
 {
 
 _WRAP_ENUM(TlsInteractionResult, GTlsInteractionResult)
+_WRAP_ENUM(TlsCertificateRequestFlags, GTlsCertificateRequestFlags)
 
 class Cancellable;
 class TlsPassword;
@@ -65,6 +67,17 @@ public:
   _WRAP_METHOD(TlsInteractionResult ask_password_finish(const Glib::RefPtr<AsyncResult>& result), 
g_tls_interaction_ask_password_finish, errthrow)
   _WRAP_METHOD(TlsInteractionResult invoke_ask_password(const Glib::RefPtr<TlsPassword>& password, const 
Glib::RefPtr<Cancellable>& cancellable{?}), g_tls_interaction_invoke_ask_password, errthrow)
 
+
+
+  _WRAP_METHOD(TlsInteractionResult invoke_request_certificate(const Glib::RefPtr<TlsConnection>& 
connection, TlsCertificateRequestFlags flags, const Glib::RefPtr<Cancellable>& cancellable{?}), 
g_tls_interaction_invoke_request_certificate, errthrow)
+
+  _WRAP_METHOD(TlsInteractionResult request_certificate(const Glib::RefPtr<TlsConnection>& connection, 
TlsCertificateRequestFlags flags, const Glib::RefPtr<Cancellable>& cancellable{?}), 
g_tls_interaction_request_certificate, errthrow)
+
+  _WRAP_METHOD(void request_certificate_async(const Glib::RefPtr<TlsConnection>& connection, 
TlsCertificateRequestFlags flags, const SlotAsyncReady& slot{callback?}, const Glib::RefPtr<Cancellable>& 
cancellable{.?}), g_tls_interaction_request_certificate_async, slot_name slot, slot_callback 
SignalProxy_async_callback)
+
+  _WRAP_METHOD(TlsInteractionResult request_certificate_finish(const Glib::RefPtr<AsyncResult>& result), 
g_tls_interaction_request_certificate_finish, errthrow)
+
+
 #m4 _CONVERSION(`GTlsPassword*',`const Glib::RefPtr<TlsPassword>&',`Glib::wrap($3, true)')
   _WRAP_VFUNC(TlsInteractionResult ask_password(const Glib::RefPtr<TlsPassword>& password, const 
Glib::RefPtr<Cancellable>& cancellable), "ask_password", errthrow)
   _WRAP_VFUNC(void ask_password_async(const Glib::RefPtr<TlsPassword>& password, const SlotAsyncReady& 
slot{callback}, const Glib::RefPtr<Cancellable>& cancellable{.}), "ask_password_async", slot_name slot, 
slot_callback SignalProxy_async_callback)
diff --git a/tools/m4/convert_gio.m4 b/tools/m4/convert_gio.m4
index c0e404a..58d2a65 100644
--- a/tools/m4/convert_gio.m4
+++ b/tools/m4/convert_gio.m4
@@ -42,6 +42,7 @@ _CONV_ENUM(G,SocketMsgFlags)
 _CONV_ENUM(G,SocketProtocol)
 _CONV_ENUM(G,SocketType)
 _CONV_ENUM(G,TlsCertificateFlags)
+_CONV_ENUM(G,TlsCertificateRequestFlags)
 _CONV_ENUM(G,TlsDatabaseVerifyFlags)
 _CONV_ENUM(G,TlsDatabaseLookupFlags)
 _CONV_ENUM(G,TlsInteractionResult)
@@ -287,20 +288,23 @@ _CONVERSION(`GTlsCertificate*', `Glib::RefPtr<TlsCertificate>', `Glib::wrap($3)'
 _CONVERSION(`const Glib::RefPtr<const TlsCertificate>&', `GTlsCertificate*', 
`const_cast<GTlsCertificate*>(Glib::unwrap($3))')
 _CONVERSION(`const Glib::RefPtr<TlsCertificate>&',`GTlsCertificate*',`Glib::unwrap($3)')
 
+#TlsConnection:
+_CONVERSION(`const Glib::RefPtr<TlsConnection>&',`GTlsConnection*',`Glib::unwrap($3)')
+
 #TlsDatabase
 _CONVERSION(`GTlsDatabase*',`Glib::RefPtr<TlsDatabase>',`Glib::wrap($3)')
-_CONVERSION(`const Glib::RefPtr<TlsDatabase>&',`GTlsDatabase*',`Glib::unwrap($3)')
+_CONVERSION(`const Glib::RefPtr<TlsDatabase>&',`GTlsDatabase*',__CONVERT_REFPTR_TO_P)
 
 #TlsInteraction
 _CONVERSION(`const Glib::RefPtr<TlsInteraction>&',`GTlsInteraction*',`Glib::unwrap($3)')
 _CONVERSION(`GTlsInteraction*',`Glib::RefPtr<TlsInteraction>',`Glib::wrap($3)')
 
 #TlsPassword
-_CONVERSION(`const Glib::RefPtr<TlsPassword>&',`GTlsPassword*',`Glib::unwrap($3)')
+_CONVERSION(`const Glib::RefPtr<TlsPassword>&',`GTlsPassword*',__CONVERT_REFPTR_TO_P)
 
 #UnixFDList
 _CONVERSION(`GUnixFDList*',`Glib::RefPtr<UnixFDList>',`Glib::wrap($3)')
-_CONVERSION(`const Glib::RefPtr<UnixFDList>&',`GUnixFDList*',`Glib::unwrap($3)')
+_CONVERSION(`const Glib::RefPtr<UnixFDList>&',`GUnixFDList*',__CONVERT_REFPTR_TO_P)
 
 #Volume
 _CONVERSION(`GVolume*',`Glib::RefPtr<Volume>',`Glib::wrap($3)')