diff options
| author | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2012-12-28 14:50:59 +0200 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2012-12-30 10:49:27 -0800 |
| commit | 4b50c0bd05f77d1ab655d15d909105c78693e74b (patch) | |
| tree | 8195bfaf67c05bc0edd446e72134385ee7e6a77d /gdbus/object.c | |
| parent | 37a54d0433189ea75657f9f04be852c0c35179e8 (diff) | |
| download | ofono-4b50c0bd05f77d1ab655d15d909105c78693e74b.tar.bz2 | |
gdbus: Introduce G_DBUS_METHOD_FLAG_EXPERIMENTAL
This flag can be used to mark methods as experimental, marked
methods are disable 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 | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/gdbus/object.c b/gdbus/object.c index e13daf7d..5fe4c7c4 100644 --- a/gdbus/object.c +++ b/gdbus/object.c @@ -84,6 +84,7 @@ struct property_data { DBusMessage *message; }; +static int global_flags = 0; static struct generic_data *root; static gboolean process_changes(gpointer user_data); @@ -129,6 +130,12 @@ static void generate_interface_xml(GString *gstr, struct interface_data *iface) G_DBUS_METHOD_FLAG_DEPRECATED; gboolean noreply = method->flags & G_DBUS_METHOD_FLAG_NOREPLY; + gboolean experimental = method->flags & + G_DBUS_METHOD_FLAG_EXPERIMENTAL; + + if (!(global_flags & G_DBUS_FLAG_ENABLE_EXPERIMENTAL) && + experimental) + continue; if (!deprecated && !noreply && !(method->in_args && method->in_args->name) && @@ -1022,10 +1029,19 @@ static DBusHandlerResult generic_message(DBusConnection *connection, for (method = iface->methods; method && method->name && method->function; method++) { + gboolean experimental = method->flags & + G_DBUS_METHOD_FLAG_EXPERIMENTAL; + if (dbus_message_is_method_call(message, iface->name, method->name) == FALSE) continue; + if (experimental) { + const char *env = g_getenv("GDBUS_EXPERIMENTAL"); + if (g_strcmp0(env, "1") != 0) + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + } + if (g_dbus_args_have_signature(method->in_args, message) == FALSE) continue; @@ -1692,3 +1708,8 @@ gboolean g_dbus_detach_object_manager(DBusConnection *connection) return TRUE; } + +void g_dbus_set_flags(int flags) +{ + global_flags = flags; +} |