diff options
| author | Patrik Flykt <patrik.flykt@linux.intel.com> | 2012-02-01 16:43:58 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2012-02-04 01:15:35 +0100 |
| commit | 837df7479ca894a2ffc1f1496ae751f03f83cfe3 (patch) | |
| tree | 2afa29cf6b149e2ef9773655b231ec2b638b5e3f /src/manager.c | |
| parent | 5ccb2dd1b6c229a7d70d5ac11234571b15c2df0b (diff) | |
| download | connman-837df7479ca894a2ffc1f1496ae751f03f83cfe3.tar.gz connman-837df7479ca894a2ffc1f1496ae751f03f83cfe3.tar.bz2 connman-837df7479ca894a2ffc1f1496ae751f03f83cfe3.zip | |
manager: Remove RequestScan D-Bus method call
Diffstat (limited to 'src/manager.c')
| -rw-r--r-- | src/manager.c | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/src/manager.c b/src/manager.c index 941bf5f1..cf2c6244 100644 --- a/src/manager.c +++ b/src/manager.c @@ -176,40 +176,6 @@ static DBusMessage *remove_provider(DBusConnection *conn, return g_dbus_create_reply(msg, DBUS_TYPE_INVALID); } -static DBusMessage *request_scan(DBusConnection *conn, - DBusMessage *msg, void *data) -{ - enum connman_service_type type; - const char *str; - int err; - - DBG("conn %p", conn); - - dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &str, - DBUS_TYPE_INVALID); - - if (g_strcmp0(str, "") == 0) - type = CONNMAN_SERVICE_TYPE_UNKNOWN; - else if (g_strcmp0(str, "wifi") == 0) - type = CONNMAN_SERVICE_TYPE_WIFI; - else if (g_strcmp0(str, "wimax") == 0) - type = CONNMAN_SERVICE_TYPE_WIMAX; - else - return __connman_error_invalid_arguments(msg); - - err = __connman_device_request_scan(type); - if (err < 0) { - if (err == -EINPROGRESS) { - connman_error("Invalid return code from scan"); - err = -EINVAL; - } - - return __connman_error_failed(msg, -err); - } - - return g_dbus_create_reply(msg, DBUS_TYPE_INVALID); -} - static DBusConnection *connection = NULL; static void session_mode_notify(void) @@ -452,7 +418,6 @@ static GDBusMethodTable manager_methods[] = { G_DBUS_METHOD_FLAG_ASYNC }, { "GetTechnologies", "", "a(oa{sv})", get_technologies }, { "RemoveProvider", "o", "", remove_provider }, - { "RequestScan", "s", "", request_scan }, { "GetServices", "", "a(oa{sv})", get_services }, { "ConnectProvider", "a{sv}", "o", connect_provider, G_DBUS_METHOD_FLAG_ASYNC }, |