summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorJosé Alburquerque <jaalburqu@svn.gnome.org>2013-01-01 20:19:47 -0500
committerJosé Alburquerque <jaalburqu@svn.gnome.org>2013-01-01 20:19:47 -0500
commitf6f3801ce576a1186d1bf2dab04498801ef3e8b4 (patch)
tree276b94be82470f66e0479e4a84c3b7ea68cb37f1 /tools
parent30b5a563f61260afbc288a29e1bbb458de217f61 (diff)
downloadglibmm-f6f3801ce576a1186d1bf2dab04498801ef3e8b4.tar.gz
giomm: Add the TlsInteraction class.
* gio/src/tlsinteraction.{ccg,hg}: * gio/src/filelist.am: Add the sources wrapping the C functions and include the sources in the build. * gio/src/gio_vfuncs.defs: Add the virtual functions of the class. The vfuncs are not wrapped yet so that gmmproc can be modified so that virtual functions with slot parameters can be wrapped as is already possible with methods. * tools/m4/convert_gio.m4: Add necessary conversions.
Diffstat (limited to 'tools')
-rw-r--r--tools/m4/convert_gio.m48
1 files changed, 6 insertions, 2 deletions
diff --git a/tools/m4/convert_gio.m4 b/tools/m4/convert_gio.m4
index ed34d9d3..70286757 100644
--- a/tools/m4/convert_gio.m4
+++ b/tools/m4/convert_gio.m4
@@ -39,8 +39,9 @@ _CONV_ENUM(G,SocketFamily)
_CONV_ENUM(G,SocketMsgFlags)
_CONV_ENUM(G,SocketProtocol)
_CONV_ENUM(G,SocketType)
-_CONV_ENUM(G, TlsCertificateFlags)
-_CONV_ENUM(G, TlsPasswordFlags)
+_CONV_ENUM(G,TlsCertificateFlags)
+_CONV_ENUM(G,TlsInteractionResult)
+_CONV_ENUM(G,TlsPasswordFlags)
_CONV_ENUM(G,UnixSocketAddressType)
_CONV_ENUM(G,ZlibCompressorFormat)
@@ -267,6 +268,9 @@ _CONVERSION(`GTimeZoneMonitor*',`Glib::RefPtr<TimeZoneMonitor>',`Glib::wrap($3)'
_CONVERSION(`GTlsCertificate*', `Glib::RefPtr<TlsCertificate>', `Glib::wrap($3)')
_CONVERSION(`const Glib::RefPtr<const TlsCertificate>&', `GTlsCertificate*', `const_cast<GTlsCertificate*>(Glib::unwrap($3))')
+#TlsPassword
+_CONVERSION(`const Glib::RefPtr<const TlsPassword>&',`GTlsPassword*',`const_cast<GTlsPassword*>(Glib::unwrap($3))')
+
#UnixFDList
_CONVERSION(`GUnixFDList*',`Glib::RefPtr<UnixFDList>',`Glib::wrap($3)')
_CONVERSION(`const Glib::RefPtr<UnixFDList>&',`GUnixFDList*',`Glib::unwrap($3)')