summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorJonathon Jongsma <jonathon@quotidian.org>2009-06-20 00:08:19 -0500
committerJonathon Jongsma <jonathon@quotidian.org>2009-06-20 00:08:19 -0500
commite963653133436d04cc4b45a312200cc795aa824f (patch)
tree9b675767c458bb3bf5561e8287150d1ba69b748e /tools
parentea4e560cc94d53f3a129a333bcbafd9d5cd2cc6d (diff)
downloadglibmm-e963653133436d04cc4b45a312200cc795aa824f.tar.gz
add start of Socket class
Diffstat (limited to 'tools')
-rwxr-xr-x[-rw-r--r--]tools/enum.pl0
-rw-r--r--tools/extra_defs_gen/generate_defs_gio.cc1
-rw-r--r--tools/m4/convert_gio.m49
3 files changed, 10 insertions, 0 deletions
diff --git a/tools/enum.pl b/tools/enum.pl
index f1b6cbee..f1b6cbee 100644..100755
--- a/tools/enum.pl
+++ b/tools/enum.pl
diff --git a/tools/extra_defs_gen/generate_defs_gio.cc b/tools/extra_defs_gen/generate_defs_gio.cc
index 5b9481e6..90b43884 100644
--- a/tools/extra_defs_gen/generate_defs_gio.cc
+++ b/tools/extra_defs_gen/generate_defs_gio.cc
@@ -81,6 +81,7 @@ int main (int argc, char** argv)
<< get_defs(G_TYPE_RESOLVER)
<< get_defs(G_TYPE_NETWORK_ADDRESS)
<< get_defs(G_TYPE_NETWORK_SERVICE)
+ << get_defs(G_TYPE_SOCKET)
<< std::endl;
diff --git a/tools/m4/convert_gio.m4 b/tools/m4/convert_gio.m4
index ab0bdc43..5a60edee 100644
--- a/tools/m4/convert_gio.m4
+++ b/tools/m4/convert_gio.m4
@@ -17,6 +17,9 @@ _CONV_ENUM(G,DataStreamByteOrder)
_CONV_ENUM(G,DataStreamNewlineType)
_CONV_ENUM(G,EmblemOrigin)
_CONV_ENUM(G,SocketFamily)
+_CONV_ENUM(G,SocketType)
+_CONV_ENUM(G,SocketProtocol)
+_CONV_ENUM(G,SocketMsgFlags)
# AppInfo
@@ -113,8 +116,14 @@ _CONVERSION(`PasswordSave',`GPasswordSave',`($2)$3')
_CONVERSION(`GOutputStream*',`Glib::RefPtr<OutputStream>',`Glib::wrap($3)')
_CONVERSION(`const Glib::RefPtr<OutputStream>&',`GOutputStream*',__CONVERT_CONST_REFPTR_TO_P)
+#Socket
+_CONVERSION(`const Glib::RefPtr<Socket>&',`GSocket*',__CONVERT_CONST_REFPTR_TO_P)
+_CONVERSION(`GSocket*',`Glib::RefPtr<Socket>',`Glib::wrap($3)')
+
#SocketAddress
_CONVERSION(`GSocketAddress*',`Glib::RefPtr<SocketAddress>',`Glib::wrap($3)')
+_CONVERSION(`const Glib::RefPtr<SocketAddress>&',`GSocketAddress*',__CONVERT_CONST_REFPTR_TO_P)
+_CONVERSION(`Glib::RefPtr<SocketAddress>&',`GSocketAddress*',__CONVERT_CONST_REFPTR_TO_P)
_CONVERSION(`GSocketAddressEnumerator*',`Glib::RefPtr<SocketAddressEnumerator>',`Glib::wrap($3)')
#Volume