diff options
| author | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2019-09-16 12:03:27 +0200 |
|---|---|---|
| committer | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2019-09-16 12:03:27 +0200 |
| commit | ca7f47f881ef938e590f5d3d91891696b6826060 (patch) | |
| tree | cf6db0067fb8fcfd661b198bc46832c41ce4585e /tools | |
| parent | e7a86070a9bf3402138f7874d050d5e72f9c76b0 (diff) | |
| download | glibmm-ca7f47f881ef938e590f5d3d91891696b6826060.tar.gz | |
Add Gio::DBus::ObjectProxy and Gio::DBus::ObjectSkeleton
In preparation for adding Gio::DBus::ObjectManager, ObjectManagerClient
and ObjectManagerServer. See issue #43.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/extra_defs_gen/generate_defs_gio.cc | 12 | ||||
| -rw-r--r-- | tools/m4/convert_gio.m4 | 4 |
2 files changed, 11 insertions, 5 deletions
diff --git a/tools/extra_defs_gen/generate_defs_gio.cc b/tools/extra_defs_gen/generate_defs_gio.cc index 229c155f..36ad4fca 100644 --- a/tools/extra_defs_gen/generate_defs_gio.cc +++ b/tools/extra_defs_gen/generate_defs_gio.cc @@ -39,6 +39,7 @@ main(int, char**) // g_type_init(); // Until the glib bug https://bugzilla.gnome.org/show_bug.cgi?id=465631 + // (https://gitlab.gnome.org/GNOME/glib/issues/100) // is fixed, get_defs() must be called for a GObject before it's // called for a GInterface. (void)get_defs(G_TYPE_APPLICATION); @@ -77,9 +78,6 @@ main(int, char**) << get_defs(G_TYPE_SIMPLE_ACTION) << get_defs(G_TYPE_SIMPLE_IO_STREAM) << get_defs(G_TYPE_SUBPROCESS) << get_defs(G_TYPE_SUBPROCESS_LAUNCHER) << get_defs(G_TYPE_THEMED_ICON) - - // TODO: This causes a g_warning: - // GLib-GObject-CRITICAL **: g_param_spec_pool_list: assertion `pool != NULL' failed" << get_defs(G_TYPE_VOLUME) << get_defs(G_TYPE_VOLUME_MONITOR) << get_defs(G_TYPE_ZLIB_COMPRESSOR) @@ -113,7 +111,13 @@ main(int, char**) << get_defs(G_TYPE_DBUS_ARG_INFO) << get_defs(G_TYPE_DBUS_MENU_MODEL) << get_defs(G_TYPE_DBUS_METHOD_INFO) << 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_INTERFACE_SKELETON) + << get_defs(G_TYPE_DBUS_OBJECT) + << get_defs(G_TYPE_DBUS_OBJECT_MANAGER) + << get_defs(G_TYPE_DBUS_OBJECT_MANAGER_CLIENT) + << get_defs(G_TYPE_DBUS_OBJECT_MANAGER_SERVER) + << get_defs(G_TYPE_DBUS_OBJECT_PROXY) + << get_defs(G_TYPE_DBUS_OBJECT_SKELETON) << get_defs(G_TYPE_DBUS_NODE_INFO) << get_defs(G_TYPE_DBUS_MESSAGE) << get_defs(G_TYPE_DBUS_METHOD_INVOCATION) << get_defs(G_TYPE_DBUS_PROXY) << get_defs(G_TYPE_DBUS_SERVER) diff --git a/tools/m4/convert_gio.m4 b/tools/m4/convert_gio.m4 index d40cac60..0e5f8d88 100644 --- a/tools/m4/convert_gio.m4 +++ b/tools/m4/convert_gio.m4 @@ -126,13 +126,15 @@ _CONVERSION(`const Glib::RefPtr<InterfaceInfo>&',`GDBusInterfaceInfo*',`Glib::un _CONVERSION(`Glib::RefPtr<InterfaceInfo>',`GDBusInterfaceInfo*',`Glib::unwrap($3)') _CONVERSION(`GDBusInterfaceInfo*',`const Glib::RefPtr<InterfaceInfo>',`Glib::wrap($3)') -# DBusInterface +# DBusInterface, DBusInterfaceSkeleton _CONVERSION(`GDBusInterface*',`Glib::RefPtr<Gio::DBus::Interface>',`Glib::wrap($3)') _CONVERSION(`Glib::RefPtr<Gio::DBus::Interface>',`GDBusInterface*',`Glib::unwrap($3)') _CONVERSION(`const Glib::RefPtr<Gio::DBus::Interface>&',`GDBusInterface*',`Glib::unwrap($3)') +_CONVERSION(`const Glib::RefPtr<Gio::DBus::InterfaceSkeleton>&',`GDBusInterfaceSkeleton*',`Glib::unwrap($3)') # DBusMethodInvocation _CONVERSION(`const Glib::RefPtr<MethodInvocation>&',`GDBusMethodInvocation*',`Glib::unwrap($3)') +_CONVERSION(`const Glib::RefPtr<Gio::DBus::MethodInvocation>&',`GDBusMethodInvocation*',`Glib::unwrap($3)') # DBusObject _CONVERSION(`GDBusObject*',`Glib::RefPtr<Gio::DBus::Object>',`Glib::wrap($3)') |