diff options
author | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2012-12-28 14:51:00 +0200 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2012-12-30 10:49:44 -0800 |
commit | 519d9a13c379cad60b1f67bb8697e2c9415b79a5 (patch) | |
tree | fc5eb2d6cc1fbcb9c3e21618a77ff4a6e9cbf6e2 /gdbus/object.c | |
parent | 1fbd845b552d13185252c5ced6997d891cc6b102 (diff) | |
download | connman-519d9a13c379cad60b1f67bb8697e2c9415b79a5.tar.gz connman-519d9a13c379cad60b1f67bb8697e2c9415b79a5.tar.bz2 connman-519d9a13c379cad60b1f67bb8697e2c9415b79a5.zip |
gdbus: Introduce G_DBUS_SIGNAL_FLAG_EXPERIMENTAL
This flag can be used to mark signals as experimental, marked
signals are disabled by default and can be enabled by setting
G_DBUS_FLAG_ENABLE_EXPERIMENTAL using g_dbus_set_flags.
Diffstat (limited to 'gdbus/object.c')
-rw-r--r-- | gdbus/object.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/gdbus/object.c b/gdbus/object.c index 5fe4c7c4..a25615f8 100644 --- a/gdbus/object.c +++ b/gdbus/object.c @@ -164,6 +164,12 @@ static void generate_interface_xml(GString *gstr, struct interface_data *iface) for (signal = iface->signals; signal && signal->name; signal++) { gboolean deprecated = signal->flags & G_DBUS_SIGNAL_FLAG_DEPRECATED; + gboolean experimental = signal->flags & + G_DBUS_SIGNAL_FLAG_EXPERIMENTAL; + + if (!(global_flags & G_DBUS_FLAG_ENABLE_EXPERIMENTAL) && + experimental) + continue; if (!deprecated && !(signal->args && signal->args->name)) g_string_append_printf(gstr, @@ -1266,10 +1272,17 @@ static gboolean check_signal(DBusConnection *conn, const char *path, } for (signal = iface->signals; signal && signal->name; signal++) { - if (!strcmp(signal->name, name)) { - *args = signal->args; - return TRUE; + if (strcmp(signal->name, name) != 0) + continue; + + if (signal->flags & G_DBUS_SIGNAL_FLAG_EXPERIMENTAL) { + const char *env = g_getenv("GDBUS_EXPERIMENTAL"); + if (g_strcmp0(env, "1") != 0) + break; } + + *args = signal->args; + return TRUE; } error("No signal named %s on interface %s", name, interface); |