cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=df75462a643c94e93cd72af4c43b9bef2bef76f3
commit df75462a643c94e93cd72af4c43b9bef2bef76f3
Author: Xavi Artigas <xavierarti...@yahoo.es>
Date: Fri Apr 6 11:06:56 2018 +0200
Efl.Net.Control.Manager (from Efl.Net.Control)
Ref https://phab.enlightenment.org/T6847
Reviewed-by: Cedric Bail <ced...@osg.samsung.com>
---
src/Makefile_Ecore_Con.am | 2 +-
src/examples/ecore/efl_net_control_example.c | 44 +++----
src/lib/ecore_con/Efl_Net.h | 2 +-
src/lib/ecore_con/efl_net-connman.h | 12 +-
src/lib/ecore_con/efl_net_control-connman.c | 128 ++++++++++-----------
src/lib/ecore_con/efl_net_control-none.c | 34 +++---
.../efl_net_control_access_point-connman.c | 6 +-
src/lib/ecore_con/efl_net_control_access_point.eo | 2 +-
...l_net_control.eo => efl_net_control_manager.eo} | 4 +-
.../ecore_con/efl_net_control_technology-connman.c | 2 +-
src/lib/ecore_con/efl_net_control_technology.eo | 6 +-
11 files changed, 121 insertions(+), 121 deletions(-)
diff --git a/src/Makefile_Ecore_Con.am b/src/Makefile_Ecore_Con.am
index f90af32a15..2568922992 100644
--- a/src/Makefile_Ecore_Con.am
+++ b/src/Makefile_Ecore_Con.am
@@ -26,7 +26,7 @@ ecore_con_eolian_files = \
lib/ecore_con/efl_net_server_ssl.eo \
lib/ecore_con/efl_net_control_access_point.eo \
lib/ecore_con/efl_net_control_technology.eo \
- lib/ecore_con/efl_net_control.eo \
+ lib/ecore_con/efl_net_control_manager.eo \
lib/ecore_con/efl_net_session.eo \
lib/ecore_con/efl_net_ip_address.eo \
lib/ecore_con/ecore_con_eet_base.eo \
diff --git a/src/examples/ecore/efl_net_control_example.c
b/src/examples/ecore/efl_net_control_example.c
index 8b92fd5da2..3053c87cad 100644
--- a/src/examples/ecore/efl_net_control_example.c
+++ b/src/examples/ecore/efl_net_control_example.c
@@ -336,7 +336,7 @@ static void
_ctl_access_points_changed(void *data EINA_UNUSED, const Efl_Event *event)
{
if (!monitoring) return;
- _access_points_list(efl_net_control_access_points_get(event->object));
+
_access_points_list(efl_net_control_manager_access_points_get(event->object));
}
static const char *
@@ -413,14 +413,14 @@ static void
_ctl_radios_offline_changed(void *data EINA_UNUSED, const Efl_Event *event)
{
if (!monitoring) return;
- printf("INFO: radios_offline=%hhu\n",
efl_net_control_radios_offline_get(event->object));
+ printf("INFO: radios_offline=%hhu\n",
efl_net_control_manager_radios_offline_get(event->object));
}
static void
_ctl_state_changed(void *data EINA_UNUSED, const Efl_Event *event)
{
const char *str = "???";
- Efl_Net_Control_State state = efl_net_control_state_get(event->object);
+ Efl_Net_Control_State state =
efl_net_control_manager_state_get(event->object);
switch (state)
{
case EFL_NET_CONTROL_STATE_OFFLINE: str = "offline"; break;
@@ -583,7 +583,7 @@ _ctl_agent_request_input(void *data EINA_UNUSED, const
Efl_Event *event)
}
}
- efl_net_control_agent_reply(ctl,
+ efl_net_control_manager_agent_reply(ctl,
name,
ssid ? &ssid_slice : NULL,
username,
@@ -600,7 +600,7 @@ _ctl_agent_request_input(void *data EINA_UNUSED, const
Efl_Event *event)
static void
_cmd_technologies_list(Eo *ctl, size_t argc EINA_UNUSED, char **argv
EINA_UNUSED)
{
- Eina_Iterator *it = efl_net_control_technologies_get(ctl);
+ Eina_Iterator *it = efl_net_control_manager_technologies_get(ctl);
Eo *tech;
Eina_Bool first = EINA_TRUE;
@@ -670,7 +670,7 @@ _technology_find(Eo *ctl, const char *name)
return NULL;
}
- it = efl_net_control_technologies_get(ctl);
+ it = efl_net_control_manager_technologies_get(ctl);
EINA_ITERATOR_FOREACH(it, child)
{
const char *tn = efl_name_get(child);
@@ -789,7 +789,7 @@ _cmd_technology_tethering(Eo *ctl, size_t argc, char **argv)
static void
_cmd_access_points_list(Eo *ctl, size_t argc EINA_UNUSED, char **argv
EINA_UNUSED)
{
- _access_points_list(efl_net_control_access_points_get(ctl));
+ _access_points_list(efl_net_control_manager_access_points_get(ctl));
}
static Eo *
@@ -808,7 +808,7 @@ _access_point_find(Eo *ctl, const char *name)
if (name[0] == '#')
prio = strtoul(name + 1, NULL, 10);
- it = efl_net_control_access_points_get(ctl);
+ it = efl_net_control_manager_access_points_get(ctl);
EINA_ITERATOR_FOREACH(it, child)
{
if (prio == UINT32_MAX)
@@ -1008,14 +1008,14 @@ _cmd_agent_set(Eo *ctl, size_t argc, char **argv)
if (argc == 1)
{
- printf("INFO: agent is %s\n",
_fmt_bool(efl_net_control_agent_enabled_get(ctl)));
+ printf("INFO: agent is %s\n",
_fmt_bool(efl_net_control_manager_agent_enabled_get(ctl)));
return;
}
if (!_parse_bool(argv[0], argv[1], &enabled))
return;
- efl_net_control_agent_enabled_set(ctl, enabled);
+ efl_net_control_manager_agent_enabled_set(ctl, enabled);
printf("INFO: agent is now %s\n", _fmt_bool(enabled));
}
@@ -1396,17 +1396,17 @@ _cmd_line(void *data, const Efl_Event *event)
}
EFL_CALLBACKS_ARRAY_DEFINE(ctl_events_cbs,
- { EFL_NET_CONTROL_EVENT_ACCESS_POINT_ADD,
_ctl_access_point_add },
- { EFL_NET_CONTROL_EVENT_ACCESS_POINT_DEL,
_ctl_access_point_del },
- { EFL_NET_CONTROL_EVENT_ACCESS_POINTS_CHANGED,
_ctl_access_points_changed },
- { EFL_NET_CONTROL_EVENT_TECHNOLOGY_ADD,
_ctl_technology_add },
- { EFL_NET_CONTROL_EVENT_TECHNOLOGY_DEL,
_ctl_technology_del },
- { EFL_NET_CONTROL_EVENT_RADIOS_OFFLINE_CHANGED,
_ctl_radios_offline_changed },
- { EFL_NET_CONTROL_EVENT_STATE_CHANGED,
_ctl_state_changed },
- { EFL_NET_CONTROL_EVENT_AGENT_RELEASED,
_ctl_agent_released },
- { EFL_NET_CONTROL_EVENT_AGENT_ERROR,
_ctl_agent_error },
- { EFL_NET_CONTROL_EVENT_AGENT_BROWSER_URL,
_ctl_agent_browser_url },
- { EFL_NET_CONTROL_EVENT_AGENT_REQUEST_INPUT,
_ctl_agent_request_input });
+ { EFL_NET_CONTROL_MANAGER_EVENT_ACCESS_POINT_ADD,
_ctl_access_point_add },
+ { EFL_NET_CONTROL_MANAGER_EVENT_ACCESS_POINT_DEL,
_ctl_access_point_del },
+ {
EFL_NET_CONTROL_MANAGER_EVENT_ACCESS_POINTS_CHANGED, _ctl_access_points_changed
},
+ { EFL_NET_CONTROL_MANAGER_EVENT_TECHNOLOGY_ADD,
_ctl_technology_add },
+ { EFL_NET_CONTROL_MANAGER_EVENT_TECHNOLOGY_DEL,
_ctl_technology_del },
+ {
EFL_NET_CONTROL_MANAGER_EVENT_RADIOS_OFFLINE_CHANGED,
_ctl_radios_offline_changed },
+ { EFL_NET_CONTROL_MANAGER_EVENT_STATE_CHANGED,
_ctl_state_changed },
+ { EFL_NET_CONTROL_MANAGER_EVENT_AGENT_RELEASED,
_ctl_agent_released },
+ { EFL_NET_CONTROL_MANAGER_EVENT_AGENT_ERROR,
_ctl_agent_error },
+ { EFL_NET_CONTROL_MANAGER_EVENT_AGENT_BROWSER_URL,
_ctl_agent_browser_url },
+ {
EFL_NET_CONTROL_MANAGER_EVENT_AGENT_REQUEST_INPUT, _ctl_agent_request_input });
static Eo *copier = NULL;
@@ -1439,7 +1439,7 @@ efl_main(void *data EINA_UNUSED,
Eo *input;
Eina_Slice line_delimiter = EINA_SLICE_STR("\n");
- ctl = efl_add(EFL_NET_CONTROL_CLASS, ev->object,
+ ctl = efl_add(EFL_NET_CONTROL_MANAGER_CLASS, ev->object,
efl_event_callback_array_add(efl_added, ctl_events_cbs(),
NULL));
if (!ctl)
{
diff --git a/src/lib/ecore_con/Efl_Net.h b/src/lib/ecore_con/Efl_Net.h
index 32039b9142..be2147105f 100644
--- a/src/lib/ecore_con/Efl_Net.h
+++ b/src/lib/ecore_con/Efl_Net.h
@@ -131,7 +131,7 @@ EAPI int ecore_con_url_shutdown(void);
#include "efl_net_control_technology.eo.h"
#include "efl_net_control_access_point.eo.h"
-#include "efl_net_control.eo.h"
+#include "efl_net_control_manager.eo.h"
#include "efl_net_session.eo.h"
#ifdef __cplusplus
diff --git a/src/lib/ecore_con/efl_net-connman.h
b/src/lib/ecore_con/efl_net-connman.h
index e66c4afd34..9c6b2c637a 100644
--- a/src/lib/ecore_con/efl_net-connman.h
+++ b/src/lib/ecore_con/efl_net-connman.h
@@ -11,7 +11,7 @@
/**
* @file efl_net-connman.h
*
- * Common infrastructure to create Efl_Net_Control and Efl_Net_Session
+ * Common infrastructure to create Efl_Net_Control_Manager and Efl_Net_Session
* based on ConnMan connection manager.
*
* @note Each connection manager that needs shared infra should create
@@ -64,14 +64,14 @@ Eldbus_Proxy *efl_net_connman_manager_get(void);
*
* @internal
*/
-Efl_Net_Control_Technology
*efl_net_connman_control_find_technology_by_type(Efl_Net_Control *ctl, const
char *tech_type);
+Efl_Net_Control_Technology
*efl_net_connman_control_find_technology_by_type(Efl_Net_Control_Manager *ctl,
const char *tech_type);
/**
* Ask Efl.Net.Control to reload access point list.
*
* @internal
*/
-void efl_net_connman_control_access_points_reload(Efl_Net_Control *ctl);
+void efl_net_connman_control_access_points_reload(Efl_Net_Control_Manager
*ctl);
/**
@@ -80,7 +80,7 @@ void
efl_net_connman_control_access_points_reload(Efl_Net_Control *ctl);
*
* @internal
*/
-Efl_Net_Control_Technology *efl_net_connman_technology_new(Efl_Net_Control
*parent, const char *path, Eldbus_Message_Iter *properties);
+Efl_Net_Control_Technology
*efl_net_connman_technology_new(Efl_Net_Control_Manager *parent, const char
*path, Eldbus_Message_Iter *properties);
/**
* Get the path of the given technology.
@@ -102,7 +102,7 @@ Efl_Net_Control_Technology_Type
efl_net_connman_technology_type_from_str(const c
*
* @internal
*/
-Efl_Net_Control_Access_Point *efl_net_connman_access_point_new(Efl_Net_Control
*parent, const char *path, Eldbus_Message_Iter *properties, unsigned int
priority);
+Efl_Net_Control_Access_Point
*efl_net_connman_access_point_new(Efl_Net_Control_Manager *parent, const char
*path, Eldbus_Message_Iter *properties, unsigned int priority);
/**
* Get the path of the given access_point.
@@ -116,7 +116,7 @@ const char
*efl_net_connman_access_point_path_get(Efl_Net_Control_Access_Point *
*
* @internal
*/
-void efl_net_connman_access_point_update(Efl_Net_Control *ap,
Eldbus_Message_Iter *properties, unsigned int priority);
+void efl_net_connman_access_point_update(Efl_Net_Control_Manager *ap,
Eldbus_Message_Iter *properties, unsigned int priority);
#endif /* _EFL_NET_CONNMAN_H_ */
diff --git a/src/lib/ecore_con/efl_net_control-connman.c
b/src/lib/ecore_con/efl_net_control-connman.c
index 0599080d44..d2fb513ac3 100644
--- a/src/lib/ecore_con/efl_net_control-connman.c
+++ b/src/lib/ecore_con/efl_net_control-connman.c
@@ -32,14 +32,14 @@ typedef struct
unsigned char radios_offline; /* 0xff = not requested */
Eldbus_Pending *radios_offline_pending;
} request;
-} Efl_Net_Control_Data;
+} Efl_Net_Control_Manager_Data;
-#define MY_CLASS EFL_NET_CONTROL_CLASS
+#define MY_CLASS EFL_NET_CONTROL_MANAGER_CLASS
-static void _efl_net_control_agent_enabled_set(Eo *o, Efl_Net_Control_Data
*pd, Eina_Bool agent_enabled);
+static void _efl_net_control_manager_agent_enabled_set(Eo *o,
Efl_Net_Control_Manager_Data *pd, Eina_Bool agent_enabled);
static Eo *
-_efl_net_control_technology_find(const Efl_Net_Control_Data *pd, const char
*path)
+_efl_net_control_technology_find(const Efl_Net_Control_Manager_Data *pd, const
char *path)
{
const Eina_List *n;
Eo *child;
@@ -56,7 +56,7 @@ _efl_net_control_technology_find(const Efl_Net_Control_Data
*pd, const char *pat
}
static Eo *
-_efl_net_control_access_point_find(const Efl_Net_Control_Data *pd, const char
*path)
+_efl_net_control_access_point_find(const Efl_Net_Control_Manager_Data *pd,
const char *path)
{
const Eina_List *n;
Eo *child;
@@ -76,14 +76,14 @@ static Eldbus_Message *
_efl_net_control_agent_release(const Eldbus_Service_Interface *service, const
Eldbus_Message *msg)
{
Eo *o = eldbus_service_object_data_get(service, "efl_net");
- Efl_Net_Control_Data *pd = efl_data_scope_get(o, MY_CLASS);
+ Efl_Net_Control_Manager_Data *pd = efl_data_scope_get(o, MY_CLASS);
DBG("Agent %p is released %s", o, eldbus_message_path_get(msg));
EINA_SAFETY_ON_NULL_GOTO(o, end);
EINA_SAFETY_ON_NULL_GOTO(pd, end);
pd->agent_enabled = EINA_FALSE;
- efl_event_callback_call(o, EFL_NET_CONTROL_EVENT_AGENT_RELEASED, NULL);
+ efl_event_callback_call(o, EFL_NET_CONTROL_MANAGER_EVENT_AGENT_RELEASED,
NULL);
end:
return eldbus_message_method_return_new(msg);
@@ -93,7 +93,7 @@ static Eldbus_Message *
_efl_net_control_agent_cancel(const Eldbus_Service_Interface *service, const
Eldbus_Message *msg)
{
Eo *o = eldbus_service_object_data_get(service, "efl_net");
- Efl_Net_Control_Data *pd = efl_data_scope_get(o, MY_CLASS);
+ Efl_Net_Control_Manager_Data *pd = efl_data_scope_get(o, MY_CLASS);
Eldbus_Message *reply;
DBG("Agent %p request canceled %s", o, eldbus_message_path_get(msg));
@@ -208,7 +208,7 @@ static Eldbus_Message *
_efl_net_control_agent_request_input(const Eldbus_Service_Interface *service,
const Eldbus_Message *msg)
{
Eo *o = eldbus_service_object_data_get(service, "efl_net");
- Efl_Net_Control_Data *pd = efl_data_scope_get(o, MY_CLASS);
+ Efl_Net_Control_Manager_Data *pd = efl_data_scope_get(o, MY_CLASS);
Efl_Net_Control_Agent_Request_Input event = { };
Efl_Net_Control_Agent_Request_Input_Information *info;
Eldbus_Message_Iter *array, *entry;
@@ -268,7 +268,7 @@ _efl_net_control_agent_request_input(const
Eldbus_Service_Interface *service, co
}
pd->agent_request_input.msg = eldbus_message_ref((Eldbus_Message *)msg);
- efl_event_callback_call(o, EFL_NET_CONTROL_EVENT_AGENT_REQUEST_INPUT,
&event);
+ efl_event_callback_call(o,
EFL_NET_CONTROL_MANAGER_EVENT_AGENT_REQUEST_INPUT, &event);
EINA_LIST_FREE(event.informational, info) free(info);
@@ -282,7 +282,7 @@ static Eldbus_Message *
_efl_net_control_agent_report_error(const Eldbus_Service_Interface *service,
const Eldbus_Message *msg)
{
Eo *o = eldbus_service_object_data_get(service, "efl_net");
- Efl_Net_Control_Data *pd = efl_data_scope_get(o, MY_CLASS);
+ Efl_Net_Control_Manager_Data *pd = efl_data_scope_get(o, MY_CLASS);
const char *path, *err_msg;
Efl_Net_Control_Agent_Error event = { };
@@ -300,7 +300,7 @@ _efl_net_control_agent_report_error(const
Eldbus_Service_Interface *service, con
event.access_point = _efl_net_control_access_point_find(pd, path);
event.message = err_msg;
- efl_event_callback_call(o, EFL_NET_CONTROL_EVENT_AGENT_ERROR, &event);
+ efl_event_callback_call(o, EFL_NET_CONTROL_MANAGER_EVENT_AGENT_ERROR,
&event);
end:
return eldbus_message_method_return_new(msg);
@@ -310,7 +310,7 @@ static Eldbus_Message *
_efl_net_control_agent_request_browser(const Eldbus_Service_Interface
*service, const Eldbus_Message *msg)
{
Eo *o = eldbus_service_object_data_get(service, "efl_net");
- Efl_Net_Control_Data *pd = efl_data_scope_get(o, MY_CLASS);
+ Efl_Net_Control_Manager_Data *pd = efl_data_scope_get(o, MY_CLASS);
const char *path, *url;
Efl_Net_Control_Agent_Browser_Url event = { };
@@ -328,7 +328,7 @@ _efl_net_control_agent_request_browser(const
Eldbus_Service_Interface *service,
event.access_point = _efl_net_control_access_point_find(pd, path);
event.url = url;
- efl_event_callback_call(o, EFL_NET_CONTROL_EVENT_AGENT_BROWSER_URL, &event);
+ efl_event_callback_call(o, EFL_NET_CONTROL_MANAGER_EVENT_AGENT_BROWSER_URL,
&event);
end:
return eldbus_message_method_return_new(msg);
@@ -402,7 +402,7 @@ static const Eldbus_Service_Interface_Desc
_efl_net_control_agent_desc = {
};
static void
-_efl_net_control_technology_added_internal(Eo *o, Efl_Net_Control_Data *pd,
Eldbus_Message_Iter *itr)
+_efl_net_control_technology_added_internal(Eo *o, Efl_Net_Control_Manager_Data
*pd, Eldbus_Message_Iter *itr)
{
const char *path;
Eldbus_Message_Iter *array;
@@ -423,14 +423,14 @@ _efl_net_control_technology_added_internal(Eo *o,
Efl_Net_Control_Data *pd, Eldb
pd->technologies = eina_list_append(pd->technologies, child);
DBG("Technology Added Path=%s", path);
- efl_event_callback_call(o, EFL_NET_CONTROL_EVENT_TECHNOLOGY_ADD, child);
+ efl_event_callback_call(o, EFL_NET_CONTROL_MANAGER_EVENT_TECHNOLOGY_ADD,
child);
}
static void
_efl_net_control_technology_added(void *data, const Eldbus_Message *msg)
{
Eo *o = data;
- Efl_Net_Control_Data *pd = efl_data_scope_get(o, MY_CLASS);
+ Efl_Net_Control_Manager_Data *pd = efl_data_scope_get(o, MY_CLASS);
Eldbus_Message_Iter *itr = eldbus_message_iter_get(msg);
_efl_net_control_technology_added_internal(o, pd, itr);
}
@@ -439,7 +439,7 @@ static void
_efl_net_control_technology_removed(void *data, const Eldbus_Message *msg)
{
Eo *o = data;
- Efl_Net_Control_Data *pd = efl_data_scope_get(o, MY_CLASS);
+ Efl_Net_Control_Manager_Data *pd = efl_data_scope_get(o, MY_CLASS);
Eo *child;
const char *path;
@@ -458,12 +458,12 @@ _efl_net_control_technology_removed(void *data, const
Eldbus_Message *msg)
pd->technologies = eina_list_remove(pd->technologies, child);
DBG("Technology Removed Path=%s", path);
- efl_event_callback_call(o, EFL_NET_CONTROL_EVENT_TECHNOLOGY_DEL, child);
+ efl_event_callback_call(o, EFL_NET_CONTROL_MANAGER_EVENT_TECHNOLOGY_DEL,
child);
efl_del(child);
}
static void
-_efl_net_control_access_point_added(Eo *o, Efl_Net_Control_Data *pd, const
char *path, Eldbus_Message_Iter *properties, unsigned int priority)
+_efl_net_control_access_point_added(Eo *o, Efl_Net_Control_Manager_Data *pd,
const char *path, Eldbus_Message_Iter *properties, unsigned int priority)
{
Eo *child;
@@ -476,11 +476,11 @@ _efl_net_control_access_point_added(Eo *o,
Efl_Net_Control_Data *pd, const char
pd->access_points = eina_list_append(pd->access_points, child);
DBG("Access Point Added Path=%s", path);
- efl_event_callback_call(o, EFL_NET_CONTROL_EVENT_ACCESS_POINT_ADD, child);
+ efl_event_callback_call(o, EFL_NET_CONTROL_MANAGER_EVENT_ACCESS_POINT_ADD,
child);
}
static void
-_efl_net_control_access_point_updated(Eo *o, Efl_Net_Control_Data *pd, const
char *path, Eldbus_Message_Iter *properties, unsigned int priority)
+_efl_net_control_access_point_updated(Eo *o, Efl_Net_Control_Manager_Data *pd,
const char *path, Eldbus_Message_Iter *properties, unsigned int priority)
{
Eo *child = _efl_net_control_access_point_find(pd, path);
if (!child)
@@ -493,7 +493,7 @@ _efl_net_control_access_point_updated(Eo *o,
Efl_Net_Control_Data *pd, const cha
}
static void
-_efl_net_control_access_point_removed(Eo *o, Efl_Net_Control_Data *pd, const
char *path)
+_efl_net_control_access_point_removed(Eo *o, Efl_Net_Control_Manager_Data *pd,
const char *path)
{
Eo *child = _efl_net_control_access_point_find(pd, path);
if (!child)
@@ -504,7 +504,7 @@ _efl_net_control_access_point_removed(Eo *o,
Efl_Net_Control_Data *pd, const cha
pd->access_points = eina_list_remove(pd->access_points, child);
DBG("Access Point Removed Path=%s", path);
- efl_event_callback_call(o, EFL_NET_CONTROL_EVENT_ACCESS_POINT_DEL, child);
+ efl_event_callback_call(o, EFL_NET_CONTROL_MANAGER_EVENT_ACCESS_POINT_DEL,
child);
efl_del(child);
}
@@ -524,7 +524,7 @@ static void
_efl_net_control_services_changed(void *data, const Eldbus_Message *msg)
{
Eo *o = data;
- Efl_Net_Control_Data *pd = efl_data_scope_get(o, MY_CLASS);
+ Efl_Net_Control_Manager_Data *pd = efl_data_scope_get(o, MY_CLASS);
Eldbus_Message_Iter *changed, *invalidated, *sub;
const char *path;
unsigned int priority;
@@ -554,7 +554,7 @@ _efl_net_control_services_changed(void *data, const
Eldbus_Message *msg)
pd->access_points = eina_list_sort(pd->access_points, 0,
_efl_net_control_access_point_sort_cb);
- efl_event_callback_call(o, EFL_NET_CONTROL_EVENT_ACCESS_POINTS_CHANGED,
NULL);
+ efl_event_callback_call(o,
EFL_NET_CONTROL_MANAGER_EVENT_ACCESS_POINTS_CHANGED, NULL);
efl_unref(o);
}
@@ -579,7 +579,7 @@ _efl_net_control_state_from_str(const char *str)
}
static void
-_efl_net_control_property_state_changed(Eo *o, Efl_Net_Control_Data *pd,
Eldbus_Message_Iter *value)
+_efl_net_control_property_state_changed(Eo *o, Efl_Net_Control_Manager_Data
*pd, Eldbus_Message_Iter *value)
{
const char *str;
Efl_Net_Control_State state;
@@ -594,11 +594,11 @@ _efl_net_control_property_state_changed(Eo *o,
Efl_Net_Control_Data *pd, Eldbus_
if (pd->state == state) return;
pd->state = state;
DBG("state=%d (%s)", state, str);
- efl_event_callback_call(o, EFL_NET_CONTROL_EVENT_STATE_CHANGED, NULL);
+ efl_event_callback_call(o, EFL_NET_CONTROL_MANAGER_EVENT_STATE_CHANGED,
NULL);
}
static void
-_efl_net_control_property_radios_offline_changed(Eo *o, Efl_Net_Control_Data
*pd, Eldbus_Message_Iter *value)
+_efl_net_control_property_radios_offline_changed(Eo *o,
Efl_Net_Control_Manager_Data *pd, Eldbus_Message_Iter *value)
{
Eina_Bool offline;
@@ -611,11 +611,11 @@ _efl_net_control_property_radios_offline_changed(Eo *o,
Efl_Net_Control_Data *pd
if (pd->radios_offline == offline) return;
pd->radios_offline = offline;
DBG("radios offline=%hhu", offline);
- efl_event_callback_call(o, EFL_NET_CONTROL_EVENT_RADIOS_OFFLINE_CHANGED,
NULL);
+ efl_event_callback_call(o,
EFL_NET_CONTROL_MANAGER_EVENT_RADIOS_OFFLINE_CHANGED, NULL);
}
static void
-_efl_net_control_property_changed_internal(Eo *o, Efl_Net_Control_Data *pd,
Eldbus_Message_Iter *itr)
+_efl_net_control_property_changed_internal(Eo *o, Efl_Net_Control_Manager_Data
*pd, Eldbus_Message_Iter *itr)
{
Eldbus_Message_Iter *value;
const char *name;
@@ -640,7 +640,7 @@ static void
_efl_net_control_property_changed(void *data, const Eldbus_Message *msg)
{
Eo *o = data;
- Efl_Net_Control_Data *pd = efl_data_scope_get(o, MY_CLASS);
+ Efl_Net_Control_Manager_Data *pd = efl_data_scope_get(o, MY_CLASS);
Eldbus_Message_Iter *itr;
itr = eldbus_message_iter_get(msg);
@@ -651,7 +651,7 @@ static void
_efl_net_control_properties_get_cb(void *data, const Eldbus_Message *msg,
Eldbus_Pending *pending)
{
Eo *o = data;
- Efl_Net_Control_Data *pd = efl_data_scope_get(o, MY_CLASS);
+ Efl_Net_Control_Manager_Data *pd = efl_data_scope_get(o, MY_CLASS);
Eldbus_Message_Iter *array, *entry;
const char *err_name, *err_msg;
@@ -683,7 +683,7 @@ static void
_efl_net_control_technologies_get_cb(void *data, const Eldbus_Message *msg,
Eldbus_Pending *pending)
{
Eo *o = data;
- Efl_Net_Control_Data *pd = efl_data_scope_get(o, MY_CLASS);
+ Efl_Net_Control_Manager_Data *pd = efl_data_scope_get(o, MY_CLASS);
Eldbus_Message_Iter *array, *entry;
const char *err_name, *err_msg;
@@ -712,7 +712,7 @@ static void
_efl_net_control_services_get_cb(void *data, const Eldbus_Message *msg,
Eldbus_Pending *pending)
{
Eo *o = data;
- Efl_Net_Control_Data *pd = efl_data_scope_get(o, MY_CLASS);
+ Efl_Net_Control_Manager_Data *pd = efl_data_scope_get(o, MY_CLASS);
Eldbus_Message_Iter *array, *sub;
const char *err_name, *err_msg, *path;
unsigned int priority = 0;
@@ -745,7 +745,7 @@ _efl_net_control_services_get_cb(void *data, const
Eldbus_Message *msg, Eldbus_P
pd->access_points = eina_list_sort(pd->access_points, 0,
_efl_net_control_access_point_sort_cb);
- efl_event_callback_call(o, EFL_NET_CONTROL_EVENT_ACCESS_POINTS_CHANGED,
NULL);
+ efl_event_callback_call(o,
EFL_NET_CONTROL_MANAGER_EVENT_ACCESS_POINTS_CHANGED, NULL);
efl_unref(o);
}
@@ -753,7 +753,7 @@ static void
_efl_net_control_radios_offline_cb(void *data, const Eldbus_Message *msg,
Eldbus_Pending *pending)
{
Eo *o = data;
- Efl_Net_Control_Data *pd = efl_data_scope_get(o, MY_CLASS);
+ Efl_Net_Control_Manager_Data *pd = efl_data_scope_get(o, MY_CLASS);
const char *err_name, *err_msg;
Eina_Bool radios_offline = pd->request.radios_offline;
@@ -774,7 +774,7 @@ _efl_net_control_radios_offline_cb(void *data, const
Eldbus_Message *msg, Eldbus
}
static void
-_efl_net_control_radios_offline_apply(Eo *o, Efl_Net_Control_Data *pd)
+_efl_net_control_radios_offline_apply(Eo *o, Efl_Net_Control_Manager_Data *pd)
{
Eldbus_Proxy *mgr = efl_net_connman_manager_get();
Eldbus_Message *msg = eldbus_proxy_method_call_new(mgr, "SetProperty");
@@ -811,34 +811,34 @@ _efl_net_control_radios_offline_apply(Eo *o,
Efl_Net_Control_Data *pd)
}
static void
-_efl_net_control_clear(Eo *o, Efl_Net_Control_Data *pd)
+_efl_net_control_clear(Eo *o, Efl_Net_Control_Manager_Data *pd)
{
Eo *child;
EINA_LIST_FREE(pd->access_points, child)
{
- efl_event_callback_call(o, EFL_NET_CONTROL_EVENT_ACCESS_POINT_DEL,
child);
+ efl_event_callback_call(o,
EFL_NET_CONTROL_MANAGER_EVENT_ACCESS_POINT_DEL, child);
efl_del(child);
}
- efl_event_callback_call(o, EFL_NET_CONTROL_EVENT_ACCESS_POINTS_CHANGED,
NULL);
+ efl_event_callback_call(o,
EFL_NET_CONTROL_MANAGER_EVENT_ACCESS_POINTS_CHANGED, NULL);
EINA_LIST_FREE(pd->technologies, child)
{
- efl_event_callback_call(o, EFL_NET_CONTROL_EVENT_TECHNOLOGY_DEL,
child);
+ efl_event_callback_call(o,
EFL_NET_CONTROL_MANAGER_EVENT_TECHNOLOGY_DEL, child);
efl_del(child);
}
pd->state = EFL_NET_CONTROL_STATE_OFFLINE;
- efl_event_callback_call(o, EFL_NET_CONTROL_EVENT_STATE_CHANGED, NULL);
+ efl_event_callback_call(o, EFL_NET_CONTROL_MANAGER_EVENT_STATE_CHANGED,
NULL);
pd->radios_offline = EINA_TRUE;
- efl_event_callback_call(o, EFL_NET_CONTROL_EVENT_RADIOS_OFFLINE_CHANGED,
NULL);
+ efl_event_callback_call(o,
EFL_NET_CONTROL_MANAGER_EVENT_RADIOS_OFFLINE_CHANGED, NULL);
}
static void
_efl_net_control_connman_name_owner_changed(void *data, const char *bus, const
char *old_id, const char *new_id)
{
Eo *o = data;
- Efl_Net_Control_Data *pd = efl_data_scope_get(o, MY_CLASS);
+ Efl_Net_Control_Manager_Data *pd = efl_data_scope_get(o, MY_CLASS);
Eldbus_Proxy *mgr;
DBG("Name Owner Changed %s: %s->%s", bus, old_id, new_id);
@@ -849,7 +849,7 @@ _efl_net_control_connman_name_owner_changed(void *data,
const char *bus, const c
if (pd->agent_enabled)
{
pd->agent_enabled = EINA_FALSE;
- efl_event_callback_call(o, EFL_NET_CONTROL_EVENT_AGENT_RELEASED,
NULL);
+ efl_event_callback_call(o,
EFL_NET_CONTROL_MANAGER_EVENT_AGENT_RELEASED, NULL);
}
return;
}
@@ -894,14 +894,14 @@ _efl_net_control_connman_name_owner_changed(void *data,
const char *bus, const c
if (pd->agent_enabled)
{
pd->agent_enabled = EINA_FALSE;
- _efl_net_control_agent_enabled_set(o, pd, EINA_TRUE);
+ _efl_net_control_manager_agent_enabled_set(o, pd, EINA_TRUE);
}
}
void
efl_net_connman_control_access_points_reload(Eo *o)
{
- Efl_Net_Control_Data *pd = efl_data_scope_get(o, MY_CLASS);
+ Efl_Net_Control_Manager_Data *pd = efl_data_scope_get(o, MY_CLASS);
Eldbus_Proxy *mgr;
Eldbus_Pending *p;
@@ -915,7 +915,7 @@ efl_net_connman_control_access_points_reload(Eo *o)
}
EOLIAN static Eo *
-_efl_net_control_efl_object_constructor(Eo *o, Efl_Net_Control_Data *pd
EINA_UNUSED)
+_efl_net_control_manager_efl_object_constructor(Eo *o,
Efl_Net_Control_Manager_Data *pd EINA_UNUSED)
{
pd->radios_offline = EINA_TRUE;
pd->request.radios_offline = 0xff;
@@ -930,7 +930,7 @@ _efl_net_control_efl_object_constructor(Eo *o,
Efl_Net_Control_Data *pd EINA_UNU
}
EOLIAN static Eo *
-_efl_net_control_efl_object_finalize(Eo *o, Efl_Net_Control_Data *pd
EINA_UNUSED)
+_efl_net_control_manager_efl_object_finalize(Eo *o,
Efl_Net_Control_Manager_Data *pd EINA_UNUSED)
{
Eldbus_Connection *conn;
char path[128];
@@ -953,7 +953,7 @@ _efl_net_control_efl_object_finalize(Eo *o,
Efl_Net_Control_Data *pd EINA_UNUSED
}
EOLIAN static void
-_efl_net_control_efl_object_destructor(Eo *o, Efl_Net_Control_Data *pd)
+_efl_net_control_manager_efl_object_destructor(Eo *o,
Efl_Net_Control_Manager_Data *pd)
{
Eldbus_Pending *p;
Eldbus_Signal_Handler *sh;
@@ -1003,40 +1003,40 @@ _efl_net_control_efl_object_destructor(Eo *o,
Efl_Net_Control_Data *pd)
}
EOLIAN static void
-_efl_net_control_radios_offline_set(Eo *o, Efl_Net_Control_Data *pd, Eina_Bool
radios_offline)
+_efl_net_control_manager_radios_offline_set(Eo *o,
Efl_Net_Control_Manager_Data *pd, Eina_Bool radios_offline)
{
pd->request.radios_offline = radios_offline;
if (pd->operating) _efl_net_control_radios_offline_apply(o, pd);
}
EOLIAN static Eina_Bool
-_efl_net_control_radios_offline_get(const Eo *o EINA_UNUSED,
Efl_Net_Control_Data *pd)
+_efl_net_control_manager_radios_offline_get(const Eo *o EINA_UNUSED,
Efl_Net_Control_Manager_Data *pd)
{
return pd->radios_offline;
}
EOLIAN static Efl_Net_Control_State
-_efl_net_control_state_get(const Eo *o EINA_UNUSED, Efl_Net_Control_Data *pd)
+_efl_net_control_manager_state_get(const Eo *o EINA_UNUSED,
Efl_Net_Control_Manager_Data *pd)
{
return pd->state;
}
EOLIAN static Eina_Iterator *
-_efl_net_control_access_points_get(const Eo *o EINA_UNUSED,
Efl_Net_Control_Data *pd)
+_efl_net_control_manager_access_points_get(const Eo *o EINA_UNUSED,
Efl_Net_Control_Manager_Data *pd)
{
return eina_list_iterator_new(pd->access_points);
}
EOLIAN static Eina_Iterator *
-_efl_net_control_technologies_get(const Eo *o EINA_UNUSED,
Efl_Net_Control_Data *pd)
+_efl_net_control_manager_technologies_get(const Eo *o EINA_UNUSED,
Efl_Net_Control_Manager_Data *pd)
{
return eina_list_iterator_new(pd->technologies);
}
Efl_Net_Control_Technology *
-efl_net_connman_control_find_technology_by_type(Efl_Net_Control *o, const char
*tech_type)
+efl_net_connman_control_find_technology_by_type(Efl_Net_Control_Manager *o,
const char *tech_type)
{
- Efl_Net_Control_Data *pd = efl_data_scope_get(o, MY_CLASS);
+ Efl_Net_Control_Manager_Data *pd = efl_data_scope_get(o, MY_CLASS);
Efl_Net_Control_Technology_Type desired =
efl_net_connman_technology_type_from_str(tech_type);
const Eina_List *n;
Eo *child;
@@ -1058,7 +1058,7 @@ static void
_efl_net_control_agent_register_cb(void *data, const Eldbus_Message *msg,
Eldbus_Pending *pending)
{
Eo *o = data;
- Efl_Net_Control_Data *pd = efl_data_scope_get(o, MY_CLASS);
+ Efl_Net_Control_Manager_Data *pd = efl_data_scope_get(o, MY_CLASS);
const char *err_name, *err_msg;
pd->pending = eina_list_remove(pd->pending, pending);
@@ -1078,7 +1078,7 @@ static void
_efl_net_control_agent_unregister_cb(void *data, const Eldbus_Message *msg,
Eldbus_Pending *pending)
{
Eo *o = data;
- Efl_Net_Control_Data *pd = efl_data_scope_get(o, MY_CLASS);
+ Efl_Net_Control_Manager_Data *pd = efl_data_scope_get(o, MY_CLASS);
const char *err_name, *err_msg;
pd->pending = eina_list_remove(pd->pending, pending);
@@ -1094,7 +1094,7 @@ _efl_net_control_agent_unregister_cb(void *data, const
Eldbus_Message *msg, Eldb
}
EOLIAN static void
-_efl_net_control_agent_enabled_set(Eo *o, Efl_Net_Control_Data *pd, Eina_Bool
agent_enabled)
+_efl_net_control_manager_agent_enabled_set(Eo *o, Efl_Net_Control_Manager_Data
*pd, Eina_Bool agent_enabled)
{
Eldbus_Pending *p;
Eldbus_Proxy *mgr;
@@ -1142,7 +1142,7 @@ _efl_net_control_agent_enabled_set(Eo *o,
Efl_Net_Control_Data *pd, Eina_Bool ag
}
EOLIAN static Eina_Bool
-_efl_net_control_agent_enabled_get(const Eo *o EINA_UNUSED,
Efl_Net_Control_Data *pd)
+_efl_net_control_manager_agent_enabled_get(const Eo *o EINA_UNUSED,
Efl_Net_Control_Manager_Data *pd)
{
return pd->agent_enabled;
}
@@ -1193,7 +1193,7 @@ _append_dict_entry_byte_array(Eldbus_Message_Iter *array,
const char *name, cons
}
EOLIAN static void
-_efl_net_control_agent_reply(Eo *o EINA_UNUSED, Efl_Net_Control_Data *pd,
const char *name, const Eina_Slice *ssid, const char *username, const char
*passphrase, const char *wps)
+_efl_net_control_manager_agent_reply(Eo *o EINA_UNUSED,
Efl_Net_Control_Manager_Data *pd, const char *name, const Eina_Slice *ssid,
const char *username, const char *passphrase, const char *wps)
{
Eldbus_Message *reply;
Eldbus_Message_Iter *msg_itr, *array;
@@ -1230,4 +1230,4 @@ _efl_net_control_agent_reply(Eo *o EINA_UNUSED,
Efl_Net_Control_Data *pd, const
eldbus_connection_send(efl_net_connman_connection_get(), reply, NULL, NULL,
-1.0);
}
-#include "efl_net_control.eo.c"
+#include "efl_net_control_manager.eo.c"
diff --git a/src/lib/ecore_con/efl_net_control-none.c
b/src/lib/ecore_con/efl_net_control-none.c
index f6ae4d801f..2a84e4b15c 100644
--- a/src/lib/ecore_con/efl_net_control-none.c
+++ b/src/lib/ecore_con/efl_net_control-none.c
@@ -9,72 +9,72 @@
typedef struct
{
-} Efl_Net_Control_Data;
+} Efl_Net_Control_Manager_Data;
EOLIAN static void
-_efl_net_control_efl_object_destructor(Eo *obj, Efl_Net_Control_Data *pd
EINA_UNUSED)
+_efl_net_control_manager_efl_object_destructor(Eo *obj,
Efl_Net_Control_Manager_Data *pd EINA_UNUSED)
{
- efl_destructor(efl_super(obj, EFL_NET_CONTROL_CLASS));
+ efl_destructor(efl_super(obj, EFL_NET_CONTROL_MANAGER_CLASS));
}
EOLIAN static Efl_Object *
-_efl_net_control_efl_object_constructor(Eo *obj, Efl_Net_Control_Data *pd
EINA_UNUSED)
+_efl_net_control_manager_efl_object_constructor(Eo *obj,
Efl_Net_Control_Manager_Data *pd EINA_UNUSED)
{
INF("EFL compiled with --with-net-control=none");
- return efl_constructor(efl_super(obj, EFL_NET_CONTROL_CLASS));
+ return efl_constructor(efl_super(obj, EFL_NET_CONTROL_MANAGER_CLASS));
}
EOLIAN static Efl_Object *
-_efl_net_control_efl_object_finalize(Eo *obj, Efl_Net_Control_Data *pd
EINA_UNUSED)
+_efl_net_control_manager_efl_object_finalize(Eo *obj,
Efl_Net_Control_Manager_Data *pd EINA_UNUSED)
{
- obj = efl_finalize(efl_super(obj, EFL_NET_CONTROL_CLASS));
- efl_event_callback_call(obj, EFL_NET_CONTROL_EVENT_STATE_CHANGED, NULL);
+ obj = efl_finalize(efl_super(obj, EFL_NET_CONTROL_MANAGER_CLASS));
+ efl_event_callback_call(obj, EFL_NET_CONTROL_MANAGER_EVENT_STATE_CHANGED,
NULL);
return obj;
}
EOLIAN static void
-_efl_net_control_radios_offline_set(Eo *obj EINA_UNUSED, Efl_Net_Control_Data
*pd EINA_UNUSED, Eina_Bool radios_offline EINA_UNUSED)
+_efl_net_control_manager_radios_offline_set(Eo *obj EINA_UNUSED,
Efl_Net_Control_Manager_Data *pd EINA_UNUSED, Eina_Bool radios_offline
EINA_UNUSED)
{
}
EOLIAN static Eina_Bool
-_efl_net_control_radios_offline_get(const Eo *obj EINA_UNUSED,
Efl_Net_Control_Data *pd EINA_UNUSED)
+_efl_net_control_manager_radios_offline_get(const Eo *obj EINA_UNUSED,
Efl_Net_Control_Manager_Data *pd EINA_UNUSED)
{
return EINA_FALSE;
}
EOLIAN static Efl_Net_Control_State
-_efl_net_control_state_get(const Eo *obj EINA_UNUSED, Efl_Net_Control_Data *pd
EINA_UNUSED)
+_efl_net_control_manager_state_get(const Eo *obj EINA_UNUSED,
Efl_Net_Control_Manager_Data *pd EINA_UNUSED)
{
return EFL_NET_CONTROL_STATE_ONLINE; /* best default for unsupported, hope
we're online */
}
EOLIAN static Eina_Iterator *
-_efl_net_control_access_points_get(const Eo *obj EINA_UNUSED,
Efl_Net_Control_Data *pd EINA_UNUSED)
+_efl_net_control_manager_access_points_get(const Eo *obj EINA_UNUSED,
Efl_Net_Control_Manager_Data *pd EINA_UNUSED)
{
return eina_list_iterator_new(NULL);
}
EOLIAN static Eina_Iterator *
-_efl_net_control_technologies_get(const Eo *obj EINA_UNUSED,
Efl_Net_Control_Data *pd EINA_UNUSED)
+_efl_net_control_manager_technologies_get(const Eo *obj EINA_UNUSED,
Efl_Net_Control_Manager_Data *pd EINA_UNUSED)
{
return eina_list_iterator_new(NULL);
}
EOLIAN static void
-_efl_net_control_agent_enabled_set(Eo *obj EINA_UNUSED, Efl_Net_Control_Data
*pd EINA_UNUSED, Eina_Bool agent_enabled EINA_UNUSED)
+_efl_net_control_manager_agent_enabled_set(Eo *obj EINA_UNUSED,
Efl_Net_Control_Manager_Data *pd EINA_UNUSED, Eina_Bool agent_enabled
EINA_UNUSED)
{
}
EOLIAN static Eina_Bool
-_efl_net_control_agent_enabled_get(const Eo *obj EINA_UNUSED,
Efl_Net_Control_Data *pd EINA_UNUSED)
+_efl_net_control_manager_agent_enabled_get(const Eo *obj EINA_UNUSED,
Efl_Net_Control_Manager_Data *pd EINA_UNUSED)
{
return EINA_FALSE;
}
EOLIAN static void
-_efl_net_control_agent_reply(Eo *obj EINA_UNUSED, Efl_Net_Control_Data *pd
EINA_UNUSED, const char *name EINA_UNUSED, const Eina_Slice *ssid EINA_UNUSED,
const char *username EINA_UNUSED, const char *passphrase EINA_UNUSED, const
char *wps EINA_UNUSED)
+_efl_net_control_manager_agent_reply(Eo *obj EINA_UNUSED,
Efl_Net_Control_Manager_Data *pd EINA_UNUSED, const char *name EINA_UNUSED,
const Eina_Slice *ssid EINA_UNUSED, const char *username EINA_UNUSED, const
char *passphrase EINA_UNUSED, const char *wps EINA_UNUSED)
{
}
-#include "efl_net_control.eo.c"
+#include "efl_net_control_manager.eo.c"
diff --git a/src/lib/ecore_con/efl_net_control_access_point-connman.c
b/src/lib/ecore_con/efl_net_control_access_point-connman.c
index 30e6f2a3a9..92c491d119 100644
--- a/src/lib/ecore_con/efl_net_control_access_point-connman.c
+++ b/src/lib/ecore_con/efl_net_control_access_point-connman.c
@@ -261,7 +261,7 @@ _efl_net_control_access_point_priority_set(Eo *o,
Efl_Net_Control_Access_Point_D
return;
}
- it = efl_net_control_access_points_get(efl_parent_get(o));
+ it = efl_net_control_manager_access_points_get(efl_parent_get(o));
EINA_ITERATOR_FOREACH(it, ap)
{
unsigned other_prio;
@@ -1618,7 +1618,7 @@ _efl_net_control_access_point_property_changed(void
*data, const Eldbus_Message
}
Efl_Net_Control_Access_Point *
-efl_net_connman_access_point_new(Efl_Net_Control *ctl, const char *path,
Eldbus_Message_Iter *properties, unsigned int priority)
+efl_net_connman_access_point_new(Efl_Net_Control_Manager *ctl, const char
*path, Eldbus_Message_Iter *properties, unsigned int priority)
{
Eo *o;
Efl_Net_Control_Access_Point_Data *pd;
@@ -1676,7 +1676,7 @@
efl_net_connman_access_point_path_get(Efl_Net_Control_Access_Point *o)
}
void
-efl_net_connman_access_point_update(Efl_Net_Control *o, Eldbus_Message_Iter
*properties, unsigned int priority)
+efl_net_connman_access_point_update(Efl_Net_Control_Manager *o,
Eldbus_Message_Iter *properties, unsigned int priority)
{
Eldbus_Message_Iter *entry;
Efl_Net_Control_Access_Point_Data *pd = efl_data_scope_get(o, MY_CLASS);
diff --git a/src/lib/ecore_con/efl_net_control_access_point.eo
b/src/lib/ecore_con/efl_net_control_access_point.eo
index 3d4ba99906..fd5483a00e 100644
--- a/src/lib/ecore_con/efl_net_control_access_point.eo
+++ b/src/lib/ecore_con/efl_net_control_access_point.eo
@@ -77,7 +77,7 @@ enum Efl.Net.Control.Access_Point.Proxy_Method {
class Efl.Net.Control.Access_Point (Efl.Loop.Consumer) {
[[An access point for network connectivity.
- The @Efl.Net.Control is composed of multiple technologies, each
+ The @Efl.Net.Control.Manager is composed of multiple technologies, each
create access points to allow configuration and connection.
An application requiring only a network connection can just
diff --git a/src/lib/ecore_con/efl_net_control.eo
b/src/lib/ecore_con/efl_net_control_manager.eo
similarity index 98%
rename from src/lib/ecore_con/efl_net_control.eo
rename to src/lib/ecore_con/efl_net_control_manager.eo
index ad500615cd..3e3068e52c 100644
--- a/src/lib/ecore_con/efl_net_control.eo
+++ b/src/lib/ecore_con/efl_net_control_manager.eo
@@ -5,7 +5,7 @@ import efl_net_control_technology;
enum Efl.Net.Control.State {
[[Provides the global network connectivity state.
- For more details, use @Efl.Net.Control access points and
+ For more details, use @Efl.Net.Control.Manager access points and
their property state.
@since 1.19
@@ -65,7 +65,7 @@ struct Efl.Net.Control.Agent_Browser_Url {
url: string; [[The URL to point the browser at.]]
}
-class Efl.Net.Control (Efl.Loop.Consumer) {
+class Efl.Net.Control.Manager (Efl.Loop.Consumer) {
[[Controls network connectivity.
This class and its child objects are only useful to implement
diff --git a/src/lib/ecore_con/efl_net_control_technology-connman.c
b/src/lib/ecore_con/efl_net_control_technology-connman.c
index 7a451e4b2b..5dfb51f961 100644
--- a/src/lib/ecore_con/efl_net_control_technology-connman.c
+++ b/src/lib/ecore_con/efl_net_control_technology-connman.c
@@ -429,7 +429,7 @@
efl_net_connman_technology_path_get(Efl_Net_Control_Technology *o)
}
Efl_Net_Control_Technology *
-efl_net_connman_technology_new(Efl_Net_Control *ctl, const char *path,
Eldbus_Message_Iter *itr)
+efl_net_connman_technology_new(Efl_Net_Control_Manager *ctl, const char *path,
Eldbus_Message_Iter *itr)
{
Eo *o;
Efl_Net_Control_Technology_Data *pd;
diff --git a/src/lib/ecore_con/efl_net_control_technology.eo
b/src/lib/ecore_con/efl_net_control_technology.eo
index 7c94b9a0e4..433f9ff1b6 100644
--- a/src/lib/ecore_con/efl_net_control_technology.eo
+++ b/src/lib/ecore_con/efl_net_control_technology.eo
@@ -20,12 +20,12 @@ enum Efl.Net.Control.Technology.Type {
class Efl.Net.Control.Technology (Efl.Loop.Consumer) {
[[A technology that allows control of network access points.
- The @Efl.Net.Control is composed of multiple technologies, each
+ The @Efl.Net.Control.Manager is composed of multiple technologies, each
can be disabled/enabled with @.powered property.
When powered, the technology will dynamically create and remove
access points in
- @Efl.Net.Control.access_points.
+ @Efl.Net.Control.Manager.access_points.
@since 1.19
]]
@@ -80,7 +80,7 @@ class Efl.Net.Control.Technology (Efl.Loop.Consumer) {
The scan will happen asynchronously in the background,
with the results being delivered by events in the
- technology, @Efl.Net.Control or @Efl.Net.Control.Access_Point
+ technology, @Efl.Net.Control.Manager or
@Efl.Net.Control.Access_Point
associated with the technology. For example, a scan on
WiFi will add and remove access points.
--
