From: Lucas De Marchi <lucas.demarchi@profusion.mobi>
To: linux-bluetooth@vger.kernel.org
Cc: Lucas De Marchi <lucas.demarchi@profusion.mobi>
Subject: [PATCH BlueZ v5 10/13] gdbus: add Deprecated annotation in introspection
Date: Wed, 16 May 2012 20:33:10 -0300 [thread overview]
Message-ID: <1337211193-18230-11-git-send-email-lucas.demarchi@profusion.mobi> (raw)
In-Reply-To: <1337211193-18230-1-git-send-email-lucas.demarchi@profusion.mobi>
---
gdbus/object.c | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/gdbus/object.c b/gdbus/object.c
index 5712dcb..1511e88 100644
--- a/gdbus/object.c
+++ b/gdbus/object.c
@@ -82,7 +82,11 @@ static void generate_interface_xml(GString *gstr, struct interface_data *iface)
const GDBusSignalTable *signal;
for (method = iface->methods; method && method->name; method++) {
- if (!(method->in_args && method->in_args->name) &&
+ gboolean deprecated = method->flags &
+ G_DBUS_METHOD_FLAG_DEPRECATED;
+
+ if (!deprecated &&
+ !(method->in_args && method->in_args->name) &&
!(method->out_args && method->out_args->name))
g_string_append_printf(gstr, "\t\t<method name=\"%s\"/>\n",
method->name);
@@ -91,18 +95,29 @@ static void generate_interface_xml(GString *gstr, struct interface_data *iface)
method->name);
print_arguments(gstr, method->in_args, "in");
print_arguments(gstr, method->out_args, "out");
+
+ if (deprecated)
+ g_string_append_printf(gstr, "\t\t\t<annotation name=\"org.freedesktop.DBus.Deprecated\" value=\"true\"/>\n");
+
g_string_append_printf(gstr, "\t\t</method>\n");
}
}
for (signal = iface->signals; signal && signal->name; signal++) {
- if (!(signal->args && signal->args->name))
+ gboolean deprecated = signal->flags &
+ G_DBUS_SIGNAL_FLAG_DEPRECATED;
+
+ if (!deprecated && !(signal->args && signal->args->name))
g_string_append_printf(gstr, "\t\t<signal name=\"%s\"/>\n",
signal->name);
else {
g_string_append_printf(gstr, "\t\t<signal name=\"%s\">\n",
signal->name);
print_arguments(gstr, signal->args, NULL);
+
+ if (deprecated)
+ g_string_append_printf(gstr, "\t\t\t<annotation name=\"org.freedesktop.DBus.Deprecated\" value=\"true\"/>\n");
+
g_string_append_printf(gstr, "\t\t</signal>\n");
}
}
--
1.7.10.2
next prev parent reply other threads:[~2012-05-16 23:33 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-16 23:33 [PATCH BlueZ v5 00/13] gdbus: Better D-Bus introspection Lucas De Marchi
2012-05-16 23:33 ` [PATCH BlueZ v5 01/13] gdbus: return if method signature is malformed Lucas De Marchi
2012-05-16 23:33 ` [PATCH BlueZ v5 02/13] gdbus: do not call memset for terminating NUL Lucas De Marchi
2012-05-16 23:33 ` [PATCH BlueZ v5 03/13] Constify GDBus method tables Lucas De Marchi
2012-05-16 23:33 ` [PATCH BlueZ v5 04/13] Constify GDBus signal tables Lucas De Marchi
2012-05-16 23:33 ` [PATCH BlueZ v5 05/13] gdbus: add argument info to methods and signals Lucas De Marchi
2012-05-16 23:33 ` [PATCH BlueZ v5 06/13] Convert GDBus methods and signals to use GDBusArgInfo Lucas De Marchi
2012-05-16 23:33 ` [PATCH BlueZ v5 07/13] gdbus: use GDBusArgInfo to generate introspection Lucas De Marchi
2012-05-16 23:33 ` [PATCH BlueZ v5 08/13] gdbus: loop over args to check message signature Lucas De Marchi
2012-05-16 23:33 ` [PATCH BlueZ v5 09/13] gdbus: remove signatures from tables Lucas De Marchi
2012-05-16 23:43 ` Marcel Holtmann
2012-05-16 23:33 ` Lucas De Marchi [this message]
2012-05-16 23:33 ` [PATCH BlueZ v5 11/13] gdbus: add Method.NoReply annotation in introspection Lucas De Marchi
2012-05-16 23:33 ` [PATCH BlueZ v5 12/13] gdbus: do not check signature twice Lucas De Marchi
2012-05-16 23:33 ` [PATCH BlueZ v5 13/13] adapter: " Lucas De Marchi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1337211193-18230-11-git-send-email-lucas.demarchi@profusion.mobi \
--to=lucas.demarchi@profusion.mobi \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).