summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2008-03-15 00:46:41 +0000
committerMarcel Holtmann <marcel@holtmann.org>2008-03-15 00:46:41 +0000
commit31e4b89ccb965ef5d955c8e99147f5f69f539899 (patch)
treefc679851b4c82776f74b1a7354805adf006a239c
parentb6233d1f358d699bbfb5e198bc18c377dc79969f (diff)
Remove some unneeded experimental checks
-rw-r--r--hcid/adapter.c30
-rw-r--r--hcid/device.c6
2 files changed, 0 insertions, 36 deletions
diff --git a/hcid/adapter.c b/hcid/adapter.c
index 6f18b7ca..2c4cdc00 100644
--- a/hcid/adapter.c
+++ b/hcid/adapter.c
@@ -3227,9 +3227,6 @@ static DBusHandlerResult get_properties(DBusConnection *conn,
bdaddr_t ba;
char str[249];
- if (!hcid_dbus_use_experimental())
- return error_unknown_method(conn, msg);
-
if (check_address(adapter->address) < 0)
return error_not_ready(conn, msg);
@@ -3284,9 +3281,6 @@ static DBusHandlerResult set_property(DBusConnection *conn,
DBusMessageIter sub;
const char *property;
- if (!hcid_dbus_use_experimental())
- return error_unknown_method(conn, msg);
-
if (!dbus_message_iter_init(msg, &iter))
return error_invalid_arguments(conn, msg, NULL);
@@ -3370,9 +3364,6 @@ static DBusHandlerResult request_mode(DBusConnection *conn,
uint8_t new_mode;
int ret;
- if (!hcid_dbus_use_experimental())
- return error_unknown_method(conn, msg);
-
if (!dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &mode,
DBUS_TYPE_INVALID))
return error_invalid_arguments(conn, msg, NULL);
@@ -3420,9 +3411,6 @@ static DBusHandlerResult list_devices(DBusConnection *conn,
DBusMessageIter iter;
DBusMessageIter array_iter;
- if (!hcid_dbus_use_experimental())
- return error_unknown_method(conn, msg);
-
if (!dbus_message_has_signature(msg, DBUS_TYPE_INVALID_AS_STRING))
return error_invalid_arguments(conn, msg, NULL);
@@ -3594,9 +3582,6 @@ static DBusHandlerResult create_device(DBusConnection *conn,
struct adapter *adapter = data;
const gchar *address;
- if (!hcid_dbus_use_experimental())
- return error_unknown_method(conn, msg);
-
if (adapter->create)
return error_in_progress(conn, msg, "CreateDevice in progress");
@@ -3612,9 +3597,6 @@ static DBusHandlerResult create_paired_device(DBusConnection *conn,
{
const gchar *address, *agent_path;
- if (!hcid_dbus_use_experimental())
- return error_unknown_method(conn, msg);
-
if (dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &address,
DBUS_TYPE_OBJECT_PATH,
&agent_path,
@@ -3639,9 +3621,6 @@ static DBusHandlerResult remove_device(DBusConnection *conn,
GSList *l;
bdaddr_t src;
- if (!hcid_dbus_use_experimental())
- return error_unknown_method(conn, msg);
-
if (dbus_message_get_args(msg, NULL, DBUS_TYPE_OBJECT_PATH, &path,
DBUS_TYPE_INVALID) == FALSE)
return error_invalid_arguments(conn, msg, NULL);
@@ -3683,9 +3662,6 @@ static DBusHandlerResult find_device(DBusConnection *conn,
const gchar *address;
GSList *l;
- if (!hcid_dbus_use_experimental())
- return error_unknown_method(conn, msg);
-
if (!dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &address,
DBUS_TYPE_INVALID))
return error_invalid_arguments(conn, msg, NULL);
@@ -3731,9 +3707,6 @@ static DBusHandlerResult register_agent(DBusConnection *conn,
struct adapter *adapter = data;
DBusMessage *reply;
- if (!hcid_dbus_use_experimental())
- return error_unknown_method(conn, msg);
-
if (!dbus_message_get_args(msg, NULL, DBUS_TYPE_OBJECT_PATH, &path,
DBUS_TYPE_INVALID))
return error_invalid_arguments(conn, msg, NULL);
@@ -3768,9 +3741,6 @@ static DBusHandlerResult unregister_agent(DBusConnection *conn,
struct adapter *adapter = data;
DBusMessage *reply;
- if (!hcid_dbus_use_experimental())
- return error_unknown_method(conn, msg);
-
if (!dbus_message_get_args(msg, NULL, DBUS_TYPE_OBJECT_PATH, &path,
DBUS_TYPE_INVALID))
return error_invalid_arguments(conn, msg, NULL);
diff --git a/hcid/device.c b/hcid/device.c
index 24ba6e51..7d48eb25 100644
--- a/hcid/device.c
+++ b/hcid/device.c
@@ -764,9 +764,6 @@ static DBusHandlerResult get_properties(DBusConnection *conn,
dbus_bool_t boolean;
uint32_t class;
- 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;
@@ -917,9 +914,6 @@ static DBusHandlerResult set_property(DBusConnection *conn,
DBusMessageIter sub;
const char *property;
- if (!hcid_dbus_use_experimental())
- return error_unknown_method(conn, msg);
-
if (!dbus_message_iter_init(msg, &iter))
return error_invalid_arguments(conn, msg, NULL);