discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=ac909ac04c680955eb6ce78a2c59865953b347bd
commit ac909ac04c680955eb6ce78a2c59865953b347bd Author: Mike Blumenkrantz <[email protected]> Date: Wed Feb 14 21:14:52 2018 -0500 efl-net: rename conflicting "name" properties --- src/examples/ecore/efl_net_control_example.c | 46 +++++++++++----------- src/examples/ecore/efl_net_session_example.c | 2 +- .../efl_net_control_access_point-connman.c | 2 +- .../ecore_con/efl_net_control_access_point-none.c | 2 +- src/lib/ecore_con/efl_net_control_access_point.eo | 2 +- .../ecore_con/efl_net_control_technology-connman.c | 2 +- .../ecore_con/efl_net_control_technology-none.c | 2 +- src/lib/ecore_con/efl_net_control_technology.eo | 9 +---- src/lib/ecore_con/efl_net_session-connman.c | 2 +- src/lib/ecore_con/efl_net_session-none.c | 2 +- src/lib/ecore_con/efl_net_session.eo | 6 +-- 11 files changed, 35 insertions(+), 42 deletions(-) diff --git a/src/examples/ecore/efl_net_control_example.c b/src/examples/ecore/efl_net_control_example.c index 1adffc68c9..8b92fd5da2 100644 --- a/src/examples/ecore/efl_net_control_example.c +++ b/src/examples/ecore/efl_net_control_example.c @@ -105,11 +105,11 @@ _access_point_print(Eo *ap) "INFO: - remembered=%hhu\n" "INFO: - immutable=%hhu\n" "INFO: - security=%#x %s\n", - efl_net_control_access_point_name_get(ap), + efl_net_control_access_point_ssid_get(ap), _access_point_state_to_str(efl_net_control_access_point_state_get(ap)), _access_point_error_to_str(efl_net_control_access_point_error_get(ap)), efl_net_control_access_point_priority_get(ap), - efl_net_control_technology_name_get(efl_net_control_access_point_technology_get(ap)), + efl_name_get(efl_net_control_access_point_technology_get(ap)), efl_net_control_access_point_strength_get(ap), efl_net_control_access_point_roaming_get(ap), efl_net_control_access_point_auto_connect_get(ap), @@ -295,8 +295,8 @@ _ctl_access_point_del(void *data EINA_UNUSED, const Efl_Event *event) Eo *ap = event->info; if (!monitoring) return; printf("INFO: Access Point Removed: %s [%s]\n", - efl_net_control_access_point_name_get(ap), - efl_net_control_technology_name_get(efl_net_control_access_point_technology_get(ap))); + efl_net_control_access_point_ssid_get(ap), + efl_name_get(efl_net_control_access_point_technology_get(ap))); } static void @@ -316,12 +316,12 @@ _access_points_list(Eina_Iterator *it) printf("INFO: %4u | %-18.18s | %c%c%c | %-13.13s | %s\n", efl_net_control_access_point_priority_get(ap), - efl_net_control_access_point_name_get(ap), + efl_net_control_access_point_ssid_get(ap), efl_net_control_access_point_remembered_get(ap) ? 'R' : '.', efl_net_control_access_point_immutable_get(ap) ? 'I' : '.', efl_net_control_access_point_auto_connect_get(ap) ? 'A' : '.', _access_point_state_to_str(efl_net_control_access_point_state_get(ap)), - efl_net_control_technology_name_get(efl_net_control_access_point_technology_get(ap))); + efl_name_get(efl_net_control_access_point_technology_get(ap))); } if (!first) @@ -373,7 +373,7 @@ _technology_print(Eo *tech) "INFO: - connected=%hhu\n" "INFO: - tethering=%hhu (id='%s', passphrase='%s')\n" "INFO: - type=%s\n", - efl_net_control_technology_name_get(tech), + efl_name_get(tech), efl_net_control_technology_powered_get(tech), efl_net_control_technology_connected_get(tech), tethering, teth_id, teth_pass, @@ -405,7 +405,7 @@ _ctl_technology_del(void *data EINA_UNUSED, const Efl_Event *event) Eo *tech = event->info; if (!monitoring) return; printf("INFO: Technology Removed: %s [%s]\n", - efl_net_control_technology_name_get(tech), + efl_name_get(tech), _technology_type_str(efl_net_control_technology_type_get(tech))); } @@ -444,7 +444,7 @@ _ctl_agent_error(void *data EINA_UNUSED, const Efl_Event *event) printf("INFO: Agent Error:\n" "INFO: - Access Point: %s\n" "INFO: - Message: %s\n", - efl_net_control_access_point_name_get(e->access_point), + efl_net_control_access_point_ssid_get(e->access_point), e->message); } @@ -455,7 +455,7 @@ _ctl_agent_browser_url(void *data EINA_UNUSED, const Efl_Event *event) printf("INFO: Agent requested to open browser:\n" "INFO: - Access Point: %s\n" "INFO: - URL: %s\n", - efl_net_control_access_point_name_get(e->access_point), + efl_net_control_access_point_ssid_get(e->access_point), e->url); } @@ -614,7 +614,7 @@ _cmd_technologies_list(Eo *ctl, size_t argc EINA_UNUSED, char **argv EINA_UNUSED } printf("INFO: %-18.18s | %c | %c | %s\n", - efl_net_control_technology_name_get(tech), + efl_name_get(tech), efl_net_control_technology_powered_get(tech) ? 'X' : ' ', efl_net_control_technology_connected_get(tech) ? 'X' : ' ', _technology_type_str(efl_net_control_technology_type_get(tech))); @@ -673,7 +673,7 @@ _technology_find(Eo *ctl, const char *name) it = efl_net_control_technologies_get(ctl); EINA_ITERATOR_FOREACH(it, child) { - const char *tn = efl_net_control_technology_name_get(child); + const char *tn = efl_name_get(child); if (strcasecmp(name, tn) == 0) { eina_iterator_free(it); @@ -706,13 +706,13 @@ _technology_scan_done(void *data, const Eina_Value v, eina_value_error_get(&v, &err); printf("INFO: technology '%s' could not scan: %s\n", - efl_net_control_technology_name_get(tech), + efl_name_get(tech), eina_error_msg_get(err)); } else { printf("INFO: technology '%s' finished scan.\n", - efl_net_control_technology_name_get(tech)); + efl_name_get(tech)); } return v; @@ -737,7 +737,7 @@ _cmd_technology_powered(Eo *ctl, size_t argc, char **argv) if (!tech) return; - name = efl_net_control_technology_name_get(tech); + name = efl_name_get(tech); if (argc <= 2) { printf("INFO: technology '%s' powered %s\n", @@ -764,7 +764,7 @@ _cmd_technology_tethering(Eo *ctl, size_t argc, char **argv) if (!tech) return; - name = efl_net_control_technology_name_get(tech); + name = efl_name_get(tech); if (argc <= 2) { efl_net_control_technology_tethering_get(tech, &enabled, &id, &pass); @@ -813,7 +813,7 @@ _access_point_find(Eo *ctl, const char *name) { if (prio == UINT32_MAX) { - const char *n = efl_net_control_access_point_name_get(child); + const char *n = efl_net_control_access_point_ssid_get(child); if (strcasecmp(name, n) == 0) { eina_iterator_free(it); @@ -860,13 +860,13 @@ _access_point_connect(void *data, const Eina_Value v, eina_value_error_get(&v, &err); printf("INFO: access point '%s' could not connect: %s\n", - efl_net_control_access_point_name_get(ap), + efl_net_control_access_point_ssid_get(ap), eina_error_msg_get(err)); } else { printf("INFO: access point '%s' finished connect.\n", - efl_net_control_access_point_name_get(ap)); + efl_net_control_access_point_ssid_get(ap)); } return v; @@ -933,7 +933,7 @@ _cmd_access_point_auto_connect(Eo *ctl, size_t argc EINA_UNUSED, char **argv) if (!ap) return; - name = efl_net_control_access_point_name_get(ap); + name = efl_net_control_access_point_ssid_get(ap); if (argc <= 2) { printf("INFO: access_point '%s' auto connect %s\n", @@ -1037,7 +1037,7 @@ _cmd_access_point_configure_ipv4(Eo *ctl, size_t argc, char **argv) return; } - name = efl_net_control_access_point_name_get(ap); + name = efl_net_control_access_point_ssid_get(ap); if (strcmp(argv[2], "off") == 0) ipv4_method = EFL_NET_CONTROL_ACCESS_POINT_IPV4_METHOD_OFF; @@ -1079,7 +1079,7 @@ _cmd_access_point_configure_ipv6(Eo *ctl, size_t argc, char **argv) return; } - name = efl_net_control_access_point_name_get(ap); + name = efl_net_control_access_point_ssid_get(ap); if (strcmp(argv[2], "off") == 0) ipv6_method = EFL_NET_CONTROL_ACCESS_POINT_IPV6_METHOD_OFF; @@ -1134,7 +1134,7 @@ _cmd_access_point_configure_proxy(Eo *ctl, size_t argc, char **argv) return; } - name = efl_net_control_access_point_name_get(ap); + name = efl_net_control_access_point_ssid_get(ap); if (strcmp(argv[2], "off") == 0) proxy_method = EFL_NET_CONTROL_ACCESS_POINT_PROXY_METHOD_OFF; diff --git a/src/examples/ecore/efl_net_session_example.c b/src/examples/ecore/efl_net_session_example.c index 55c8d05d33..683f3414e0 100644 --- a/src/examples/ecore/efl_net_session_example.c +++ b/src/examples/ecore/efl_net_session_example.c @@ -45,7 +45,7 @@ _changed(void *data EINA_UNUSED, const Efl_Event *event) "INFO: - state: %s\n" "INFO: - technology: %s\n" "INFO: - interface: '%s'\n", - efl_net_session_name_get(session), + efl_net_session_network_name_get(session), _state_str(efl_net_session_state_get(session)), _technology_str(efl_net_session_technology_get(session)), efl_net_session_interface_get(session)); 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 bd8e3d4e34..9ddd7b49c1 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 @@ -217,7 +217,7 @@ _efl_net_control_access_point_error_get(Eo *o EINA_UNUSED, Efl_Net_Control_Acces } EOLIAN static const char * -_efl_net_control_access_point_name_get(Eo *o EINA_UNUSED, Efl_Net_Control_Access_Point_Data *pd) +_efl_net_control_access_point_ssid_get(Eo *o EINA_UNUSED, Efl_Net_Control_Access_Point_Data *pd) { return pd->name; } diff --git a/src/lib/ecore_con/efl_net_control_access_point-none.c b/src/lib/ecore_con/efl_net_control_access_point-none.c index 26353f4f5f..5841053710 100644 --- a/src/lib/ecore_con/efl_net_control_access_point-none.c +++ b/src/lib/ecore_con/efl_net_control_access_point-none.c @@ -30,7 +30,7 @@ _efl_net_control_access_point_error_get(Eo *obj EINA_UNUSED, Efl_Net_Control_Acc } EOLIAN static const char * -_efl_net_control_access_point_name_get(Eo *obj EINA_UNUSED, Efl_Net_Control_Access_Point_Data *pd EINA_UNUSED) +_efl_net_control_access_point_ssid_get(Eo *obj EINA_UNUSED, Efl_Net_Control_Access_Point_Data *pd EINA_UNUSED) { return NULL; } 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 948325cab9..3d4ba99906 100644 --- a/src/lib/ecore_con/efl_net_control_access_point.eo +++ b/src/lib/ecore_con/efl_net_control_access_point.eo @@ -153,7 +153,7 @@ class Efl.Net.Control.Access_Point (Efl.Loop.Consumer) { } } - @property name { + @property ssid { [[The user-friendly access point name. For hidden WiFi networks, this is empty. 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 704d6afb49..d868d29897 100644 --- a/src/lib/ecore_con/efl_net_control_technology-connman.c +++ b/src/lib/ecore_con/efl_net_control_technology-connman.c @@ -333,7 +333,7 @@ _efl_net_control_technology_connected_get(Eo *o EINA_UNUSED, Efl_Net_Control_Tec } EOLIAN static const char * -_efl_net_control_technology_name_get(Eo *o EINA_UNUSED, Efl_Net_Control_Technology_Data *pd) +_efl_net_control_technology_efl_object_name_get(Eo *o EINA_UNUSED, Efl_Net_Control_Technology_Data *pd) { return pd->name; } diff --git a/src/lib/ecore_con/efl_net_control_technology-none.c b/src/lib/ecore_con/efl_net_control_technology-none.c index e3fe22df7e..474701074c 100644 --- a/src/lib/ecore_con/efl_net_control_technology-none.c +++ b/src/lib/ecore_con/efl_net_control_technology-none.c @@ -45,7 +45,7 @@ _efl_net_control_technology_connected_get(Eo *obj EINA_UNUSED, Efl_Net_Control_T } EOLIAN static const char * -_efl_net_control_technology_name_get(Eo *obj EINA_UNUSED, Efl_Net_Control_Technology_Data *pd EINA_UNUSED) +_efl_net_control_technology_efl_object_name_get(Eo *obj EINA_UNUSED, Efl_Net_Control_Technology_Data *pd EINA_UNUSED) { return NULL; } diff --git a/src/lib/ecore_con/efl_net_control_technology.eo b/src/lib/ecore_con/efl_net_control_technology.eo index f65d702fc4..116adbeb66 100644 --- a/src/lib/ecore_con/efl_net_control_technology.eo +++ b/src/lib/ecore_con/efl_net_control_technology.eo @@ -65,14 +65,6 @@ class Efl.Net.Control.Technology (Efl.Loop.Consumer) { } } - @property name { - [[The user-friendly technology name]] - get { } - values { - name: string; [[Technology name]] - } - } - @property type { [[The technology type, such as "ethernet" or "wifi"]] get { } @@ -102,5 +94,6 @@ class Efl.Net.Control.Technology (Efl.Loop.Consumer) { implements { Efl.Object.destructor; + Efl.Object.name { get; } } } diff --git a/src/lib/ecore_con/efl_net_session-connman.c b/src/lib/ecore_con/efl_net_session-connman.c index f414d986dd..ca8362ca42 100644 --- a/src/lib/ecore_con/efl_net_session-connman.c +++ b/src/lib/ecore_con/efl_net_session-connman.c @@ -618,7 +618,7 @@ _efl_net_session_efl_object_destructor(Eo *o, Efl_Net_Session_Data *pd) } EOLIAN static const char * -_efl_net_session_name_get(Eo *o EINA_UNUSED, Efl_Net_Session_Data *pd) +_efl_net_session_network_name_get(Eo *o EINA_UNUSED, Efl_Net_Session_Data *pd) { return pd->name; } diff --git a/src/lib/ecore_con/efl_net_session-none.c b/src/lib/ecore_con/efl_net_session-none.c index 6545520dda..15b8b28df0 100644 --- a/src/lib/ecore_con/efl_net_session-none.c +++ b/src/lib/ecore_con/efl_net_session-none.c @@ -33,7 +33,7 @@ _efl_net_session_efl_object_finalize(Eo *obj, Efl_Net_Session_Data *pd EINA_UNUS } EOLIAN static const char * -_efl_net_session_name_get(Eo *obj EINA_UNUSED, Efl_Net_Session_Data *pd EINA_UNUSED) +_efl_net_session_network_name_get(Eo *obj EINA_UNUSED, Efl_Net_Session_Data *pd EINA_UNUSED) { return NULL; } diff --git a/src/lib/ecore_con/efl_net_session.eo b/src/lib/ecore_con/efl_net_session.eo index 6ae9db299f..095e7d19c9 100644 --- a/src/lib/ecore_con/efl_net_session.eo +++ b/src/lib/ecore_con/efl_net_session.eo @@ -38,7 +38,7 @@ class Efl.Net.Session (Efl.Loop.Consumer) { Some platforms may not implement the backend for this class. In this cases the system will report always @.state "online" (@Efl.Net.Session.State.online) and other properties will be - NULL, such as @.name, @.interface, @.ipv4 and @.ipv6; as well as + NULL, such as @.network_name, @.interface, @.ipv4 and @.ipv6; as well as @.technology is set to @Efl.Net.Session.Technology.unknown. As such if you need to detect for an actual backend, check if the state is online but those properties are NULL or technology is @@ -84,7 +84,7 @@ class Efl.Net.Session (Efl.Loop.Consumer) { ]] } - @property name { + @property network_name { [[The user-friendly access point name.]] get { } values { @@ -97,7 +97,7 @@ class Efl.Net.Session (Efl.Loop.Consumer) { \@note if there is no backend for this class, then state will be always online, however @.technology will be - unknown, @.interface, @.name, @.ipv4 and @.ipv6 will be + unknown, @.interface, @.network_name, @.ipv4 and @.ipv6 will be NULL. ]] get { } --
