[glibmm] DBusMethodInvocation: Add UnixFDList return_value() method overload.
- From: Josà Alburquerque <jaalburqu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glibmm] DBusMethodInvocation: Add UnixFDList return_value() method overload.
- Date: Thu, 13 Oct 2011 20:12:10 +0000 (UTC)
commit 7f7f658edf637f7205fb8bdcac893f5e1477e338
Author: Josà Alburquerque <jaalburqu svn gnome org>
Date: Thu Oct 13 16:11:17 2011 -0400
DBusMethodInvocation: Add UnixFDList return_value() method overload.
* gio/src/dbusmethodinvocation.hg: Add the method overload.
* gio/src/dbusmessage.hg: Add an _IGNORE.
ChangeLog | 7 +++++++
gio/src/dbusmessage.hg | 2 ++
gio/src/dbusmethodinvocation.hg | 6 ++++++
3 files changed, 15 insertions(+), 0 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index dc33f9e..21d1fdc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 b692562..7f00f28 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 ffb7ee1..72ecb73 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)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]