summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorJosé Alburquerque <jaalburquerque@gmail.com>2013-06-05 23:48:55 -0400
committerJosé Alburquerque <jaalburquerque@gmail.com>2013-06-05 23:48:55 -0400
commit8e3da2e4d6eb6a201e4874fef6139307e092a162 (patch)
treec97f14dab4c7d2942f2daa63b983db90aac89074 /tools
parentb3942deaf6c152c5992eabb77bfb6dbd4004ea07 (diff)
downloadglibmm-8e3da2e4d6eb6a201e4874fef6139307e092a162.tar.gz
giomm: Add the Gio::DBus::InterfaceSkeleton class.
* gio/src/dbusinterfaceskeleton.{ccg,hg}: * gio/src/filelist.am: Add the sources wrapping the methods, properties and signals and list the sources in the list of files to be built. * gio/src/gio_signals.defs: * tools/extra_defs_gen/generate_defs_gio.cc: Add the GDBUSInterfaceSkeleton GType to the properties and signals defs generation tool and regenerate the .defs file. * tools/m4/convert_gio.m4: Add the conversions for the wrapped methods, properties and signals.
Diffstat (limited to 'tools')
-rw-r--r--tools/extra_defs_gen/generate_defs_gio.cc1
-rw-r--r--tools/m4/convert_gio.m44
2 files changed, 5 insertions, 0 deletions
diff --git a/tools/extra_defs_gen/generate_defs_gio.cc b/tools/extra_defs_gen/generate_defs_gio.cc
index 6e63aea4..6d202bb2 100644
--- a/tools/extra_defs_gen/generate_defs_gio.cc
+++ b/tools/extra_defs_gen/generate_defs_gio.cc
@@ -141,6 +141,7 @@ int main(int, char**)
<< get_defs(G_TYPE_DBUS_SIGNAL_INFO)
<< get_defs(G_TYPE_DBUS_PROPERTY_INFO)
<< get_defs(G_TYPE_DBUS_INTERFACE_INFO)
+ << get_defs(G_TYPE_DBUS_INTERFACE_SKELETON)
<< get_defs(G_TYPE_DBUS_OBJECT)
<< get_defs(G_TYPE_DBUS_NODE_INFO)
<< get_defs(G_TYPE_DBUS_MESSAGE)
diff --git a/tools/m4/convert_gio.m4 b/tools/m4/convert_gio.m4
index edc359b2..3a827ade 100644
--- a/tools/m4/convert_gio.m4
+++ b/tools/m4/convert_gio.m4
@@ -9,6 +9,7 @@ _CONV_ENUM(G,DataStreamByteOrder)
_CONV_ENUM(G,DataStreamNewlineType)
_CONV_ENUM(GDBus,CallFlags)
_CONV_ENUM(GDBus,CapabilityFlags)
+_CONV_ENUM(GDBus, InterfaceSkeletonFlags)
_CONV_ENUM(GDBus,MessageFlags)
_CONV_ENUM(GDBus,MessageHeaderField)
_CONV_ENUM(GDBus,MessageType)
@@ -123,6 +124,9 @@ _CONVERSION(`GDBusInterface*',`Glib::RefPtr<Gio::DBus::Interface>',`Glib::wrap($
_CONVERSION(`Glib::RefPtr<Gio::DBus::Interface>',`GDBusInterface*',`Glib::unwrap($3)')
_CONVERSION(`const Glib::RefPtr<Gio::DBus::Interface>&',`GDBusInterface*',`Glib::unwrap($3)')
+# DBusMethodInvocation
+_CONVERSION(`const Glib::RefPtr<MethodInvocation>&',`GDBusMethodInvocation*',`Glib::unwrap($3)')
+
# DBusObject
_CONVERSION(`GDBusObject*',`Glib::RefPtr<Gio::DBus::Object>',`Glib::wrap($3)')
_CONVERSION(`const Glib::RefPtr<Gio::DBus::Object>&',`GDBusObject*',`Glib::unwrap($3)')