diff options
| author | José Alburquerque <jaalburqu@svn.gnome.org> | 2011-10-13 16:11:17 -0400 |
|---|---|---|
| committer | José Alburquerque <jaalburqu@svn.gnome.org> | 2011-10-13 16:11:17 -0400 |
| commit | 7f7f658edf637f7205fb8bdcac893f5e1477e338 (patch) | |
| tree | 3f19fc0ae36e6d6d0da6e4704b08482a855474a1 | |
| parent | c589a3db61a7d256db23553808e0f63126787ce1 (diff) | |
| download | glibmm-7f7f658edf637f7205fb8bdcac893f5e1477e338.tar.gz | |
DBusMethodInvocation: Add UnixFDList return_value() method overload.
* gio/src/dbusmethodinvocation.hg: Add the method overload.
* gio/src/dbusmessage.hg: Add an _IGNORE.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | gio/src/dbusmessage.hg | 2 | ||||
| -rw-r--r-- | gio/src/dbusmethodinvocation.hg | 6 |
3 files changed, 15 insertions, 0 deletions
@@ -1,3 +1,10 @@ +2011-10-13 José Alburquerque <jaalburqu@svn.gnome.org> + + DBusMethodInvocation: Add UnixFDList return_value() method overload. + + * gio/src/dbusmethodinvocation.hg: Add the method overload. + * gio/src/dbusmessage.hg: Add an _IGNORE. + 2011-10-13 Murray Cumming <murrayc@murrayc.com> Do not include glib/gvarianttype.h. diff --git a/gio/src/dbusmessage.hg b/gio/src/dbusmessage.hg index b6925628..7f00f283 100644 --- a/gio/src/dbusmessage.hg +++ b/gio/src/dbusmessage.hg @@ -71,6 +71,8 @@ public: _WRAP_METHOD(static Glib::RefPtr<Message> create_method_reply(const Glib::RefPtr<Message>& method_call_message), g_dbus_message_new_method_reply) _WRAP_METHOD(static Glib::RefPtr<Message> create_method_error_literal(const Glib::RefPtr<const Message>& method_call_message, const Glib::ustring& error_name, const Glib::ustring& error_message), g_dbus_message_new_method_error_literal) + // Ignore variable argument function. + _IGNORE(g_dbus_message_new_method_error) _WRAP_METHOD(static Glib::RefPtr<Message> create_from_blob(const guchar* blob, gsize blob_len, CapabilityFlags capabilities = CAPABILITY_FLAGS_NONE), g_dbus_message_new_from_blob, errthrow) diff --git a/gio/src/dbusmethodinvocation.hg b/gio/src/dbusmethodinvocation.hg index ffb7ee14..72ecb730 100644 --- a/gio/src/dbusmethodinvocation.hg +++ b/gio/src/dbusmethodinvocation.hg @@ -77,9 +77,15 @@ public: //even if it isn't ambiguous to the compiler. _WRAP_METHOD(void return_value(const Glib::VariantContainerBase& parameters), g_dbus_method_invocation_return_value) + _WRAP_METHOD(void return_value(const Glib::VariantContainerBase& parameters, const Glib::RefPtr<UnixFDList>& fd_list), g_dbus_method_invocation_return_value_with_unix_fd_list, ifdef G_OS_UNIX) + #m4 _CONVERSION(`const Glib::ustring&', `GQuark', `Glib::QueryQuark($3).id()') _WRAP_METHOD(void return_error(const Glib::ustring& domain, int code, const Glib::ustring& message), g_dbus_method_invocation_return_error_literal) + // This function does not have to be wrapped because it's a convenience C + // function to avoid having to unreference the error (in C). + _IGNORE(g_dbus_method_invocation_take_error) + #m4 _CONVERSION(`const Glib::Error&', `const GError*', `$3.gobj()') _WRAP_METHOD(void return_error(const Glib::Error& error), g_dbus_method_invocation_return_gerror) |