service: Remove LoginRequired property

Remove LoginRequired property and associated functions

diff --git a/src/connman.h b/src/connman.h
index 4745c22..3f7667a 100644 (file)
--- a/src/connman.h
+++ b/src/connman.h
@@ -490,7 +490,6 @@ int __connman_service_indicate_error(struct connman_service *service,
                                        enum connman_service_error error);
 int __connman_service_clear_error(struct connman_service *service);
 int __connman_service_indicate_default(struct connman_service *service);
-int __connman_service_request_login(struct connman_service *service);
 
 int __connman_service_connect(struct connman_service *service);
 int __connman_service_disconnect(struct connman_service *service);

diff --git a/src/service.c b/src/service.c
index 3afc877..f199e59 100644 (file)
--- a/src/service.c
+++ b/src/service.c
@@ -79,7 +79,6 @@ struct connman_service {
        char *passphrase;
        char *agent_passphrase;
        connman_bool_t roaming;
-       connman_bool_t login_required;
        connman_bool_t network_created;
        struct connman_ipconfig *ipconfig_ipv4;
        struct connman_ipconfig *ipconfig_ipv6;
@@ -1333,18 +1332,6 @@ static void passphrase_changed(struct connman_service *service)
                                                DBUS_TYPE_BOOLEAN, &required);
 }
 
-static void login_changed(struct connman_service *service)
-{
-       dbus_bool_t required = service->login_required;
-
-       if (service->path == NULL)
-               return;
-
-       connman_dbus_property_changed_basic(service->path,
-                               CONNMAN_SERVICE_INTERFACE, "LoginRequired",
-                                               DBUS_TYPE_BOOLEAN, &required);
-}
-
 static void append_security(DBusMessageIter *iter, void *user_data)
 {
        struct connman_service *service = user_data;
@@ -2066,9 +2053,6 @@ static void append_properties(DBusMessageIter *dict, dbus_bool_t limited,
                connman_dbus_dict_append_basic(dict, "Name",
                                        DBUS_TYPE_STRING, &service->name);
 
-       connman_dbus_dict_append_basic(dict, "LoginRequired",
-                               DBUS_TYPE_BOOLEAN, &service->login_required);
-
        switch (service->type) {
        case CONNMAN_SERVICE_TYPE_UNKNOWN:
        case CONNMAN_SERVICE_TYPE_SYSTEM:
@@ -4098,11 +4082,6 @@ static int service_indicate_state(struct connman_service *service)
        }
 
        if (new_state == CONNMAN_SERVICE_STATE_ONLINE) {
-               if (service->login_required == TRUE) {
-                       service->login_required = FALSE;
-                       login_changed(service);
-               }
-
                connman_timeserver_sync();
        }
 
@@ -4470,19 +4449,6 @@ int __connman_service_ipconfig_indicate_state(struct connman_service *service,
        return ret;
 }
 
-int __connman_service_request_login(struct connman_service *service)
-{
-       DBG("service %p", service);
-
-       if (service == NULL)
-               return -EINVAL;
-
-       service->login_required = TRUE;
-       login_changed(service);
-
-       return 0;
-}
-
 static connman_bool_t prepare_network(struct connman_service *service)
 {
        enum connman_network_type type;

diff --git a/src/wispr.c b/src/wispr.c
index 48f00bd..3d8bafd 100644 (file)
--- a/src/wispr.c
+++ b/src/wispr.c
@@ -486,8 +486,6 @@ static gboolean wispr_manage_message(GWebResult *result,
 
                wp_context->wispr_result = CONNMAN_WISPR_RESULT_LOGIN;
 
-               __connman_service_request_login(wp_context->service);
-
                if (__connman_agent_request_login_input(wp_context->service,
                                        wispr_portal_request_wispr_login,
                                        wp_context) != -EIO)
@@ -565,8 +563,6 @@ static gboolean wispr_portal_web_result(GWebResult *result, gpointer user_data)
                if (g_web_result_get_header(result, "X-ConnMan-Status",
                                                                &str) == TRUE)
                        portal_manage_status(result, wp_context);
-               else
-                       __connman_service_request_login(wp_context->service);
 
                break;
        case 302: