Remove some experimental tags for stable methods

5 files changed, 16 insertions, 38 deletions

diff --git a/hcid/dbus-api.txt b/hcid/dbus-api.txt
index 91e610f2..7f1ed3b6 100644
--- a/hcid/dbus-api.txt
+++ b/hcid/dbus-api.txt
@@ -215,14 +215,14 @@ Service		org.bluez
 Interface	org.bluez.Database
 Object path	/org/bluez or /org/bluez/{hci0,hci1,...}
 
-Methods		void RegisterService(string identifier, string name, string description) [experimental]
+Methods		void RegisterService(string identifier, string name, string description)
 
 			This method registers a new service specified by
 			its unique identifier. This is only needed for
 			services that are not started through the
 			Bluetooth daemon.
 
-		void UnregisterService(string identifier) [experimental]
+		void UnregisterService(string identifier)
 
 			This method unregisters a service specified by
 			its unique identifier.
@@ -263,7 +263,7 @@ Methods		void RegisterService(string identifier, string name, string description
 					 org.bluez.Error.DoesNotExist
 					 org.bluez.Error.Failed
 
-		void RequestAuthorization(string address, string uuid) [experimental]
+		void RequestAuthorization(string address, string uuid)
 
 			This method gets called when a service wants to check
 			if a remote device is authorized to perform some
@@ -275,7 +275,7 @@ Methods		void RegisterService(string identifier, string name, string description
 			profile requesting the authorization. This parameter
 			can also be left blank.
 
-		void CancelAuthorizationRequest(string address, string uuid) [experimental]
+		void CancelAuthorizationRequest(string address, string uuid)
 
 			This method cancels an authorization process requested
 			by a previous call to RequestAuthorization(). The
@@ -818,24 +818,25 @@ Methods		dict GetInfo()
 			Possible errors: org.bluez.Error.InvalidArguments
 			                 org.bluez.Error.Failed
 
-		void SetTrusted(string address) [experimental]
+		void SetTrusted(string address)
 
-			Marks the user as trusted.
+			Marks the remote device as trusted. Authorization
+			request will automatically succeed.
 
 			Possible errors: org.bluez.Error.InvalidArguments
 			                 org.bluez.Error.AlreadyExists
 
-		boolean IsTrusted(string address) [experimental]
+		boolean IsTrusted(string address)
 
 			Returns true if the user is trusted or false otherwise.
-			The address parameter must match one of the
-			current users of the service.
+			The address parameter must match one of the remote
+			devices of the service.
 
 			Possible errors: org.bluez.Error.InvalidArguments
 
-		void RemoveTrust(string address) [experimental]
+		void RemoveTrust(string address)
 
-			Marks the user as not trusted.
+			Marks the remote device as not trusted.
 
 			Possible errors: org.bluez.Error.InvalidArguments
 					 org.bluez.Error.DoesNotExist
@@ -1145,7 +1146,8 @@ Methods		dict GetInfo()
 			Returns true if the service has been started and
 			is currently active. Otherwise, it returns false.
 
-		boolean IsExternal() [experimental]
+		boolean IsExternal()
+
 			Returns true if the service was registered using the
 			Database.RegisterService method instead of a .service
 			file. The Start and Stop methods are not applicable to
@@ -1266,7 +1268,7 @@ Methods		void RegisterDefaultPasskeyAgent(string path)
 
 			Possible errors: org.bluez.Error.DoesNotExist
 
-		void RegisterDefaultAuthorizationAgent(string path) [experimental]
+		void RegisterDefaultAuthorizationAgent(string path)
 
 			This registers the default authorization agent. It can
 			register an authorization agent for all adapters or
@@ -1277,7 +1279,7 @@ Methods		void RegisterDefaultPasskeyAgent(string path)
 			authorization agent that will be called when an
 			authorization request needs to be answered.
 
-		void UnregisterDefaultAuthorizationAgent(string path) [experimental]
+		void UnregisterDefaultAuthorizationAgent(string path)
 
 			This unregisters a default authorization agent that has
 			been previously registered. The path parameter must
diff --git a/hcid/dbus-database.c b/hcid/dbus-database.c
index 0e1d2f7b..e4d8e4b3 100644
--- a/hcid/dbus-database.c
+++ b/hcid/dbus-database.c
@@ -329,9 +329,6 @@ static DBusHandlerResult register_service(DBusConnection *conn,
 	DBusMessage *reply;
 	const char *sender, *ident, *name, *desc;
 
-	if (!hcid_dbus_use_experimental())
-		return error_unknown_method(conn, msg);
-
 	if (dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &ident,
 			DBUS_TYPE_STRING, &name, DBUS_TYPE_STRING, &desc,
 						DBUS_TYPE_INVALID) == FALSE)
@@ -356,9 +353,6 @@ static DBusHandlerResult unregister_service(DBusConnection *conn,
 	const char *sender, *ident;
 	struct service *service;
 
-	if (!hcid_dbus_use_experimental())
-		return error_unknown_method(conn, msg);
-
 	if (dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &ident,
 						DBUS_TYPE_INVALID) == FALSE)
 		return error_invalid_arguments(conn, msg);
@@ -393,9 +387,6 @@ static DBusHandlerResult request_authorization(DBusConnection *conn,
 
 	debug("RequestAuthorization");
 
-	if (!hcid_dbus_use_experimental())
-		return error_unknown_method(conn, msg);
-
 	if (dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &address,
 			DBUS_TYPE_STRING, &path, DBUS_TYPE_INVALID) == FALSE)
 		return error_invalid_arguments(conn, msg);
@@ -436,9 +427,6 @@ static DBusHandlerResult cancel_authorization_request(DBusConnection *conn,
 	const char *sender, *address, *path;
 	struct service *service;
 
-	if (!hcid_dbus_use_experimental())
-		return error_unknown_method(conn, msg);
-
 	if (dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &address,
 			DBUS_TYPE_STRING, &path, DBUS_TYPE_INVALID) == FALSE)
 		return error_invalid_arguments(conn, msg);
diff --git a/hcid/dbus-rfcomm.c b/hcid/dbus-rfcomm.c
index 58df0bfc..f12f6ade 100644
--- a/hcid/dbus-rfcomm.c
+++ b/hcid/dbus-rfcomm.c
@@ -1044,9 +1044,6 @@ static DBusMethodVTable rfcomm_methods[] = {
 
 dbus_bool_t rfcomm_init(DBusConnection *conn, const char *path)
 {
-	if (!hcid_dbus_use_experimental())
-		return TRUE;
-
 	if (rfcomm_ctl < 0) {
 		rfcomm_ctl = socket(AF_BLUETOOTH, SOCK_RAW, BTPROTO_RFCOMM);
 		if (rfcomm_ctl < 0)
diff --git a/hcid/dbus-security.c b/hcid/dbus-security.c
index 41782535..1d12eca6 100644
--- a/hcid/dbus-security.c
+++ b/hcid/dbus-security.c
@@ -561,9 +561,6 @@ static DBusHandlerResult register_default_auth_agent(DBusConnection *conn,
 	DBusMessage *reply;
 	const char *path;
 
-	if (!hcid_dbus_use_experimental())
-		return error_unknown_method(conn, msg);
-
 	if (default_auth_agent)
 		return error_auth_agent_already_exists(conn, msg);
 
@@ -605,9 +602,6 @@ static DBusHandlerResult unregister_default_auth_agent(DBusConnection *conn,
 	const char *path, *name;
 	DBusMessage *reply;
 
-	if (!hcid_dbus_use_experimental())
-		return error_unknown_method(conn, msg);
-
 	if (!default_auth_agent)
 		return error_auth_agent_does_not_exist(conn, msg);
 
diff --git a/hcid/dbus-service.c b/hcid/dbus-service.c
index ea6c6e7f..27d4bbad 100644
--- a/hcid/dbus-service.c
+++ b/hcid/dbus-service.c
@@ -505,9 +505,6 @@ static DBusHandlerResult is_external(DBusConnection *conn,
 	struct service *service = data;
 	DBusMessage *reply;
 
-	if (!hcid_dbus_use_experimental())
-		return error_unknown_method(conn, msg);
-
 	reply = dbus_message_new_method_return(msg);
 	if (!reply)
 		return DBUS_HANDLER_RESULT_NEED_MEMORY;