linux-bluetooth.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 v6 12/15] gdbus: add Deprecated annotation in introspection
Date: Thu, 17 May 2012 15:20:09 -0300	[thread overview]
Message-ID: <1337278812-4837-13-git-send-email-lucas.demarchi@profusion.mobi> (raw)
In-Reply-To: <1337278812-4837-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 fcdd6ec..95947f3 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


  parent reply	other threads:[~2012-05-17 18:20 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-17 18:19 [PATCH BlueZ v6 00/15] gdbus: Better D-Bus introspection Lucas De Marchi
2012-05-17 18:19 ` [PATCH BlueZ v6 01/15] gdbus: return if method signature is malformed Lucas De Marchi
2012-05-18  2:53   ` Marcel Holtmann
2012-05-17 18:19 ` [PATCH BlueZ v6 02/15] gdbus: do not call memset for terminating NUL Lucas De Marchi
2012-05-18  2:54   ` Marcel Holtmann
2012-05-17 18:20 ` [PATCH BlueZ v6 03/15] Constify GDBus method tables Lucas De Marchi
2012-05-18  2:55   ` Marcel Holtmann
2012-05-17 18:20 ` [PATCH BlueZ v6 04/15] Constify GDBus signal tables Lucas De Marchi
2012-05-17 18:20 ` [PATCH BlueZ v6 05/15] gdbus: add argument info to methods and signals Lucas De Marchi
2012-05-17 18:20 ` [PATCH BlueZ v6 06/15] gdbus: add and use helpers for table declarations Lucas De Marchi
2012-05-17 18:20 ` [PATCH BlueZ v6 07/15] Convert GDBus methods to use macro helpers Lucas De Marchi
2012-05-17 18:20 ` [PATCH BlueZ v6 08/15] gdbus: use GDBusArgInfo to generate introspection Lucas De Marchi
2012-05-17 18:20 ` [PATCH BlueZ v6 09/15] gdbus: loop over args to check message signature Lucas De Marchi
2012-05-17 18:20 ` [PATCH BlueZ v6 10/15] Do not set signature and reply in GDBus tables Lucas De Marchi
2012-05-17 18:20 ` [PATCH BlueZ v6 11/15] gdbus: remove signature and reply from tables Lucas De Marchi
2012-05-17 18:20 ` Lucas De Marchi [this message]
2012-05-17 18:20 ` [PATCH BlueZ v6 13/15] gdbus: add Method.NoReply annotation in introspection Lucas De Marchi
2012-05-17 18:20 ` [PATCH BlueZ v6 14/15] gdbus: do not check signature twice Lucas De Marchi
2012-05-17 18:20 ` [PATCH BlueZ v6 15/15] 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=1337278812-4837-13-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).