This is an automated email from the git hooks/post-receive script.
git pushed a commit to reference refs/pull/142/head
in repository enlightenment.
View the commit online.
commit 1c328b6b17c546582af5748eedc988a1af2b8400
Author: Cedric BAIL <[email protected]>
AuthorDate: Mon Aug 3 14:04:07 2026 -0600
networkmanager - move the new code onto the module's enm_ prefix
The neutral model and the backends went in as e_net_*/e_net.h, which
reads like core API - e_* is what src/bin uses - and left the module
carrying three prefixes at once: enm_, e_net_ and ecm_.
Modules here namespace themselves: bz_ in bluez5, econnman_ in the old
connman module, enm_ in this one. So e_net_* becomes enm_net_*, the
connman agent's ecm_* becomes enm_cm_*, and the files follow.
E_Net_* types keep their name: E_-prefixed types are already this
module's practice (E_NM_Config, E_NM_Instance), so they are not the odd
ones out - the lowercase functions and the e_net.h filename were.
Co-Authored-By: Claude Opus 5 <[email protected]>
---
po/POTFILES.in | 8 +--
src/modules/networkmanager/e_mod_main.c | 56 +++++++--------
src/modules/networkmanager/e_mod_main.h | 2 +-
src/modules/networkmanager/{e_net.c => enm_net.c} | 82 +++++++++++-----------
src/modules/networkmanager/{e_net.h => enm_net.h} | 76 ++++++++++----------
.../{e_net_connman.c => enm_net_connman.c} | 80 ++++++++++-----------
.../{e_net_connman.h => enm_net_connman.h} | 20 +++---
...net_connman_agent.c => enm_net_connman_agent.c} | 18 ++---
.../networkmanager/{e_net_nm.c => enm_net_nm.c} | 64 ++++++++---------
src/modules/networkmanager/meson.build | 12 ++--
10 files changed, 209 insertions(+), 209 deletions(-)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ad5ba3597..2c5380653 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -599,10 +599,6 @@ src/modules/networkmanager/agent.c
src/modules/networkmanager/e_mod_config.c
src/modules/networkmanager/e_mod_main.c
src/modules/networkmanager/e_mod_main.h
-src/modules/networkmanager/e_net.c
-src/modules/networkmanager/e_net_connman.c
-src/modules/networkmanager/e_net_connman_agent.c
-src/modules/networkmanager/e_net_nm.c
src/modules/networkmanager/e_networkmanager.c
src/modules/networkmanager/e_networkmanager.h
src/modules/networkmanager/e_networkmanager_import.c
@@ -611,6 +607,10 @@ src/modules/networkmanager/e_networkmanager_vpn.c
src/modules/networkmanager/e_networkmanager_vpn.h
src/modules/networkmanager/e_networkmanager_vpn_username.c
src/modules/networkmanager/e_networkmanager_vpn_username.h
+src/modules/networkmanager/enm_net.c
+src/modules/networkmanager/enm_net_connman.c
+src/modules/networkmanager/enm_net_connman_agent.c
+src/modules/networkmanager/enm_net_nm.c
src/modules/networkmanager/test_vpn_username.c
src/modules/notification/e_mod_config.c
src/modules/notification/e_mod_main.c
diff --git a/src/modules/networkmanager/e_mod_main.c b/src/modules/networkmanager/e_mod_main.c
index 638dfad99..4c6c5f726 100644
--- a/src/modules/networkmanager/e_mod_main.c
+++ b/src/modules/networkmanager/e_mod_main.c
@@ -302,7 +302,7 @@ static Evas_Object *_enm_bt_icon_new(E_Net_Service *svc, Evas_Object *parent);
* service object; `svc` is a cache refreshed on every update pass, so it is
* only safe to use from inside a genlist callback or immediately after a
* refresh. Anything that survives across the main loop (dialogs, timers)
- * must re-resolve through e_net_service_find(mgr, id).
+ * must re-resolve through enm_net_service_find(mgr, id).
*/
typedef struct _Enm_Item_Data
{
@@ -390,7 +390,7 @@ _enm_itc_ap_text_get(void *data, Evas_Object *obj EINA_UNUSED,
if (!strcmp(part, "elm.text.sub"))
{
if (svc->ip_address) return strdup(svc->ip_address);
- return strdup(e_net_security_to_str(svc->security));
+ return strdup(enm_net_security_to_str(svc->security));
}
return NULL;
@@ -527,7 +527,7 @@ _enm_vpn_fs_done_cb(void *data, Evas_Object *fs EINA_UNUSED, void *event)
/* The backend works out the config type and does any follow-up it needs;
* we only report the outcome. */
- e_net_vpn_import(file, _enm_vpn_import_done_cb, NULL);
+ enm_net_vpn_import(file, _enm_vpn_import_done_cb, NULL);
e_object_del(E_OBJECT(dialog));
}
@@ -579,9 +579,9 @@ _enm_itc_group_vpn_content_get(void *data, Evas_Object *obj, const char *part)
btn = _enm_icon_button_new(obj, "add");
if (!btn) return NULL;
- if (!e_net_vpn_import_supported())
+ if (!enm_net_vpn_import_supported())
{
- const char *why = e_net_vpn_import_unavailable_reason();
+ const char *why = enm_net_vpn_import_unavailable_reason();
elm_object_disabled_set(btn, EINA_TRUE);
if (why) elm_object_tooltip_text_set(btn, why);
@@ -667,8 +667,8 @@ _enm_vpn_menu_autoconn_cb(void *data, E_Menu *m EINA_UNUSED,
E_Net_Service *svc;
if (!ctxt || !ctxt->mgr) return;
- svc = e_net_service_find(ctxt->mgr, id);
- if (svc) e_net_autoconnect_set(ctxt->mgr, svc, e_menu_item_toggle_get(mi));
+ svc = enm_net_service_find(ctxt->mgr, id);
+ if (svc) enm_net_autoconnect_set(ctxt->mgr, svc, e_menu_item_toggle_get(mi));
}
/* Small context struct carrying the service id into the confirmation dialog
@@ -706,9 +706,9 @@ _enm_vpn_forget_ok_cb(void *data, E_Dialog *d)
networkmanager_mod->data : NULL;
if (ctxt && ctxt->mgr && ctx && ctx->id)
{
- E_Net_Service *svc = e_net_service_find(ctxt->mgr, ctx->id);
+ E_Net_Service *svc = enm_net_service_find(ctxt->mgr, ctx->id);
- if (svc) e_net_forget(ctxt->mgr, svc);
+ if (svc) enm_net_forget(ctxt->mgr, svc);
}
/* Clear the dialog's data ref before delete so the del-attach cb
* cannot double-free the ctx. */
@@ -764,7 +764,7 @@ _enm_vpn_menu_forget_cb(void *data, E_Menu *m EINA_UNUSED,
networkmanager_mod->data : NULL;
if (!ctxt || !ctxt->mgr) return;
- _enm_vpn_show_forget_dialog(e_net_service_find(ctxt->mgr, data));
+ _enm_vpn_show_forget_dialog(enm_net_service_find(ctxt->mgr, data));
}
/* "edit-delete" forget button on each VPN row (mirrors the wifi forget UX). */
@@ -882,7 +882,7 @@ _enm_wifi_toggle_changed(void *data, Evas_Object *obj,
E_NM_Instance *inst = data;
if (!inst || !inst->ctxt || !inst->ctxt->mgr) return;
- e_net_wifi_enabled_set(inst->ctxt->mgr, elm_check_state_get(obj));
+ enm_net_wifi_enabled_set(inst->ctxt->mgr, elm_check_state_get(obj));
enm_mod_aps_update_now();
}
@@ -962,7 +962,7 @@ _enm_item_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
/* Re-resolve: the cached pointer is only good for the current pass, and
* this runs from an event callback. */
- svc = e_net_service_find(mgr, id->id);
+ svc = enm_net_service_find(mgr, id->id);
if (!svc) return;
/* Tapping a connected row disconnects it, tapping an idle one connects.
@@ -971,12 +971,12 @@ _enm_item_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
if (E_NET_STATE_IS_UP(svc->state))
{
INF("row tapped (up): disconnecting '%s'", svc->name ?: svc->id);
- if (!selected) e_net_disconnect(mgr, svc);
+ if (!selected) enm_net_disconnect(mgr, svc);
}
else
{
INF("row tapped (idle): connecting '%s'", svc->name ?: svc->id);
- if (selected) e_net_connect(mgr, svc);
+ if (selected) enm_net_connect(mgr, svc);
}
}
@@ -1015,7 +1015,7 @@ _enm_ap_icon_new(E_Net_Service *svc, Evas_Object *parent)
if (!icon) return NULL;
- elm_layout_signal_emit(icon, e_net_security_theme_signal(svc->security),
+ elm_layout_signal_emit(icon, enm_net_security_theme_signal(svc->security),
"e");
if (svc->frequency > 0)
@@ -1067,10 +1067,10 @@ _enm_forget_click_cb(void *data, Evas_Object *obj EINA_UNUSED,
if (ctxt && ctxt->mgr)
{
- svc = e_net_service_find(ctxt->mgr, id);
+ svc = enm_net_service_find(ctxt->mgr, id);
/* The backend clears svc->saved optimistically so the button goes
* away on this rebuild rather than after a D-Bus round trip. */
- if (svc) e_net_forget(ctxt->mgr, svc);
+ if (svc) enm_net_forget(ctxt->mgr, svc);
}
enm_mod_aps_update_now();
@@ -1255,8 +1255,8 @@ _enm_popup_update(E_Net_Manager *mgr, E_NM_Instance *inst)
* user couldn't tap again to disconnect. Instead we cancel only when the
* target item is actually deleted (orphan pass below). */
- eth_n = e_net_service_count(mgr, E_NET_TYPE_ETHERNET);
- bt_n = e_net_service_count(mgr, E_NET_TYPE_BLUETOOTH);
+ eth_n = enm_net_service_count(mgr, E_NET_TYPE_ETHERNET);
+ bt_n = enm_net_service_count(mgr, E_NET_TYPE_BLUETOOTH);
/* ------------------------------------------------------------------
* Pass 1: index every existing row by service id. Group headers live
@@ -1471,7 +1471,7 @@ _enm_popup_new(E_NM_Instance *inst)
if (!ctxt->mgr) return;
- e_net_scan(ctxt->mgr);
+ enm_net_scan(ctxt->mgr);
inst->popup = e_gadcon_popup_new(inst->gcc, 0);
@@ -1669,7 +1669,7 @@ _enm_mod_manager_update_inst(E_NM_Module_Context *ctxt EINA_UNUSED,
edje_object_signal_emit(o, buf, "e");
/* Hover label: SSID or interface name. A NULL label means "keep
- * whatever is up" — see e_net_manager_active_set. */
+ * whatever is up" — see enm_net_manager_active_set. */
label = mgr ? mgr->active_name : "";
if (label)
edje_object_part_text_set(o, "e.text.label", label);
@@ -1677,7 +1677,7 @@ _enm_mod_manager_update_inst(E_NM_Module_Context *ctxt EINA_UNUSED,
/* Security overlay and frequency band on the gadget icon. With nothing
* connected both fall back to their empty forms. */
edje_object_signal_emit(o,
- e_net_security_theme_signal(mgr ? mgr->active_security : 0), "e");
+ enm_net_security_theme_signal(mgr ? mgr->active_security : 0), "e");
if (mgr && mgr->active_frequency > 0)
{
@@ -1757,7 +1757,7 @@ _enm_vpn_emit_shield(E_NM_Module_Context *ctxt)
if (!ctxt || !ctxt->mgr) return;
- n = e_net_vpn_active_count(ctxt->mgr);
+ n = enm_net_vpn_active_count(ctxt->mgr);
sig = n > 0 ? "e,vpn,active" : "e,vpn,inactive";
DBG("VPN shield emit: active_count=%u -> signal='%s' (%u instances)",
@@ -2413,10 +2413,10 @@ e_modapi_init(E_Module *m)
ctxt->pipe_fd = -1;
ctxt->poll_time = networkmanager_config->poll_time;
- e_net_module_callbacks_set(&_enm_mod_cbs);
- e_net_backend_preference_set(networkmanager_config->backend);
+ enm_net_module_callbacks_set(&_enm_mod_cbs);
+ enm_net_backend_preference_set(networkmanager_config->backend);
- if (!e_net_init()) goto error_nm_system_init;
+ if (!enm_net_init()) goto error_nm_system_init;
ctxt->conf_dialog = NULL;
networkmanager_mod = m;
@@ -2470,8 +2470,8 @@ e_modapi_shutdown(E_Module *m)
Enm_Traffic_Worker *w = ctxt->worker;
w->ctxt = NULL;
}
- e_net_shutdown();
- e_net_module_callbacks_set(NULL);
+ enm_net_shutdown();
+ enm_net_module_callbacks_set(NULL);
_enm_instances_free(ctxt);
_enm_configure_registry_unregister();
diff --git a/src/modules/networkmanager/e_mod_main.h b/src/modules/networkmanager/e_mod_main.h
index 9521895bd..da31b170d 100644
--- a/src/modules/networkmanager/e_mod_main.h
+++ b/src/modules/networkmanager/e_mod_main.h
@@ -3,7 +3,7 @@
#include <e.h>
-#include "e_net.h"
+#include "enm_net.h"
#define AGENT_PATH "/org/freedesktop/NetworkManager/SecretAgent"
#define NETWORKMANAGER_CONFIG_VERSION 1
diff --git a/src/modules/networkmanager/e_net.c b/src/modules/networkmanager/enm_net.c
similarity index 87%
rename from src/modules/networkmanager/e_net.c
rename to src/modules/networkmanager/enm_net.c
index ef4ab86a5..9d2efe0ba 100644
--- a/src/modules/networkmanager/e_net.c
+++ b/src/modules/networkmanager/enm_net.c
@@ -1,8 +1,8 @@
#include "e.h"
-#include "e_net.h"
+#include "enm_net.h"
/*
- * Neutral network model — see e_net.h.
+ * Neutral network model — see enm_net.h.
*
* This file owns service and manager lifetime, display ordering, the UI
* callback indirection, and dispatch onto whichever backend is bound. It
@@ -24,13 +24,13 @@
* does not own net.connman, so the ConnMan candidate is simply unavailable
* there and NM wins.
*/
-extern const E_Net_Backend e_net_backend_nm;
-extern const E_Net_Backend e_net_backend_connman;
+extern const E_Net_Backend enm_net_backend_nm;
+extern const E_Net_Backend enm_net_backend_connman;
static const E_Net_Backend *const _backends[] =
{
- &e_net_backend_connman,
- &e_net_backend_nm,
+ &enm_net_backend_connman,
+ &enm_net_backend_nm,
};
#define BACKEND_COUNT ((int)(sizeof(_backends) / sizeof(_backends[0])))
@@ -51,38 +51,38 @@ static char *_preference;
/* -------------------------------------------------------------------------- */
void
-e_net_module_callbacks_set(const E_Net_Mod_Callbacks *cbs)
+enm_net_module_callbacks_set(const E_Net_Mod_Callbacks *cbs)
{
_mod_cbs = cbs;
}
void
-e_net_notify_services_changed(E_Net_Manager *mgr)
+enm_net_notify_services_changed(E_Net_Manager *mgr)
{
if (_mod_cbs && _mod_cbs->services_changed) _mod_cbs->services_changed(mgr);
}
void
-e_net_notify_service_state_changed(E_Net_Manager *mgr)
+enm_net_notify_service_state_changed(E_Net_Manager *mgr)
{
if (_mod_cbs && _mod_cbs->service_state_changed)
_mod_cbs->service_state_changed(mgr);
}
void
-e_net_notify_manager_update(E_Net_Manager *mgr)
+enm_net_notify_manager_update(E_Net_Manager *mgr)
{
if (_mod_cbs && _mod_cbs->manager_update) _mod_cbs->manager_update(mgr);
}
void
-e_net_notify_manager_inout(E_Net_Manager *mgr)
+enm_net_notify_manager_inout(E_Net_Manager *mgr)
{
if (_mod_cbs && _mod_cbs->manager_inout) _mod_cbs->manager_inout(mgr);
}
void
-e_net_notify_vpn_active_changed(E_Net_Manager *mgr)
+enm_net_notify_vpn_active_changed(E_Net_Manager *mgr)
{
if (_mod_cbs && _mod_cbs->vpn_active_changed)
_mod_cbs->vpn_active_changed(mgr);
@@ -93,7 +93,7 @@ e_net_notify_vpn_active_changed(E_Net_Manager *mgr)
/* -------------------------------------------------------------------------- */
E_Net_Service *
-e_net_service_new(E_Net_Manager *mgr, const char *id, E_Net_Type type)
+enm_net_service_new(E_Net_Manager *mgr, const char *id, E_Net_Type type)
{
E_Net_Service *svc;
@@ -113,7 +113,7 @@ e_net_service_new(E_Net_Manager *mgr, const char *id, E_Net_Type type)
}
void
-e_net_service_del(E_Net_Manager *mgr, E_Net_Service *svc)
+enm_net_service_del(E_Net_Manager *mgr, E_Net_Service *svc)
{
if (!mgr || !svc) return;
@@ -127,7 +127,7 @@ e_net_service_del(E_Net_Manager *mgr, E_Net_Service *svc)
}
void
-e_net_service_name_set(E_Net_Service *svc, const char *name)
+enm_net_service_name_set(E_Net_Service *svc, const char *name)
{
if (!svc) return;
if (svc->name && name && !strcmp(svc->name, name)) return;
@@ -136,7 +136,7 @@ e_net_service_name_set(E_Net_Service *svc, const char *name)
}
void
-e_net_service_iface_set(E_Net_Service *svc, const char *iface)
+enm_net_service_iface_set(E_Net_Service *svc, const char *iface)
{
if (!svc) return;
if (svc->iface && iface && !strcmp(svc->iface, iface)) return;
@@ -145,7 +145,7 @@ e_net_service_iface_set(E_Net_Service *svc, const char *iface)
}
void
-e_net_service_ip_set(E_Net_Service *svc, const char *ip)
+enm_net_service_ip_set(E_Net_Service *svc, const char *ip)
{
if (!svc) return;
if (svc->ip_address && ip && !strcmp(svc->ip_address, ip)) return;
@@ -154,7 +154,7 @@ e_net_service_ip_set(E_Net_Service *svc, const char *ip)
}
Eina_Bool
-e_net_service_state_set(E_Net_Service *svc, E_Net_State state)
+enm_net_service_state_set(E_Net_Service *svc, E_Net_State state)
{
if (!svc) return EINA_FALSE;
if (svc->state == state) return EINA_FALSE;
@@ -165,7 +165,7 @@ e_net_service_state_set(E_Net_Service *svc, E_Net_State state)
}
E_Net_Service *
-e_net_service_find(E_Net_Manager *mgr, const char *id)
+enm_net_service_find(E_Net_Manager *mgr, const char *id)
{
E_Net_Service *svc;
const char *shared;
@@ -186,7 +186,7 @@ e_net_service_find(E_Net_Manager *mgr, const char *id)
}
unsigned int
-e_net_service_count(E_Net_Manager *mgr, E_Net_Type type)
+enm_net_service_count(E_Net_Manager *mgr, E_Net_Type type)
{
E_Net_Service *svc;
unsigned int n = 0;
@@ -198,7 +198,7 @@ e_net_service_count(E_Net_Manager *mgr, E_Net_Type type)
}
unsigned int
-e_net_vpn_active_count(E_Net_Manager *mgr)
+enm_net_vpn_active_count(E_Net_Manager *mgr)
{
E_Net_Service *svc;
unsigned int n = 0;
@@ -253,7 +253,7 @@ _service_sort_cb(const void *a, const void *b)
}
void
-e_net_manager_sort(E_Net_Manager *mgr)
+enm_net_manager_sort(E_Net_Manager *mgr)
{
if (!mgr || !mgr->services) return;
mgr->services = eina_inlist_sort(mgr->services, _service_sort_cb);
@@ -264,7 +264,7 @@ e_net_manager_sort(E_Net_Manager *mgr)
/* -------------------------------------------------------------------------- */
E_Net_Manager *
-e_net_manager_new(const E_Net_Backend *backend)
+enm_net_manager_new(const E_Net_Backend *backend)
{
E_Net_Manager *mgr;
@@ -278,7 +278,7 @@ e_net_manager_new(const E_Net_Backend *backend)
}
void
-e_net_manager_free(E_Net_Manager *mgr)
+enm_net_manager_free(E_Net_Manager *mgr)
{
if (!mgr) return;
@@ -286,7 +286,7 @@ e_net_manager_free(E_Net_Manager *mgr)
{
E_Net_Service *svc =
EINA_INLIST_CONTAINER_GET(mgr->services, E_Net_Service);
- e_net_service_del(mgr, svc);
+ enm_net_service_del(mgr, svc);
}
eina_stringshare_del(mgr->active_name);
@@ -296,7 +296,7 @@ e_net_manager_free(E_Net_Manager *mgr)
}
void
-e_net_manager_active_set(E_Net_Manager *mgr, E_Net_Type type,
+enm_net_manager_active_set(E_Net_Manager *mgr, E_Net_Type type,
const char *name, const char *iface,
uint8_t strength, unsigned int security,
uint16_t frequency)
@@ -329,7 +329,7 @@ e_net_manager_active_set(E_Net_Manager *mgr, E_Net_Type type,
*/
void
-e_net_backend_preference_set(const char *name)
+enm_net_backend_preference_set(const char *name)
{
free(_preference);
_preference = (name && name[0]) ? strdup(name) : NULL;
@@ -431,7 +431,7 @@ _cb_name_owner_changed(void *data, const char *bus EINA_UNUSED,
}
Eina_Bool
-e_net_init(void)
+enm_net_init(void)
{
int i;
@@ -454,7 +454,7 @@ e_net_init(void)
}
void
-e_net_shutdown(void)
+enm_net_shutdown(void)
{
int i;
@@ -498,14 +498,14 @@ e_net_shutdown(void)
(((mgr) && (mgr)->backend) ? (mgr)->backend : NULL)
void
-e_net_scan(E_Net_Manager *mgr)
+enm_net_scan(E_Net_Manager *mgr)
{
const E_Net_Backend *be = BACKEND_OF(mgr);
if (be && be->scan) be->scan(mgr);
}
void
-e_net_connect(E_Net_Manager *mgr, E_Net_Service *svc)
+enm_net_connect(E_Net_Manager *mgr, E_Net_Service *svc)
{
const E_Net_Backend *be = BACKEND_OF(mgr);
if (!svc) return;
@@ -513,7 +513,7 @@ e_net_connect(E_Net_Manager *mgr, E_Net_Service *svc)
}
void
-e_net_disconnect(E_Net_Manager *mgr, E_Net_Service *svc)
+enm_net_disconnect(E_Net_Manager *mgr, E_Net_Service *svc)
{
const E_Net_Backend *be = BACKEND_OF(mgr);
if (!svc) return;
@@ -521,7 +521,7 @@ e_net_disconnect(E_Net_Manager *mgr, E_Net_Service *svc)
}
void
-e_net_forget(E_Net_Manager *mgr, E_Net_Service *svc)
+enm_net_forget(E_Net_Manager *mgr, E_Net_Service *svc)
{
const E_Net_Backend *be = BACKEND_OF(mgr);
if (!svc) return;
@@ -529,7 +529,7 @@ e_net_forget(E_Net_Manager *mgr, E_Net_Service *svc)
}
void
-e_net_autoconnect_set(E_Net_Manager *mgr, E_Net_Service *svc, Eina_Bool on)
+enm_net_autoconnect_set(E_Net_Manager *mgr, E_Net_Service *svc, Eina_Bool on)
{
const E_Net_Backend *be = BACKEND_OF(mgr);
if (!svc) return;
@@ -537,28 +537,28 @@ e_net_autoconnect_set(E_Net_Manager *mgr, E_Net_Service *svc, Eina_Bool on)
}
void
-e_net_wifi_enabled_set(E_Net_Manager *mgr, Eina_Bool enabled)
+enm_net_wifi_enabled_set(E_Net_Manager *mgr, Eina_Bool enabled)
{
const E_Net_Backend *be = BACKEND_OF(mgr);
if (be && be->wifi_enabled_set) be->wifi_enabled_set(mgr, enabled);
}
Eina_Bool
-e_net_vpn_import_supported(void)
+enm_net_vpn_import_supported(void)
{
if (!_backend || !_backend->vpn_import_supported) return EINA_FALSE;
return _backend->vpn_import_supported();
}
const char *
-e_net_vpn_import_unavailable_reason(void)
+enm_net_vpn_import_unavailable_reason(void)
{
if (!_backend || !_backend->vpn_import_unavailable_reason) return NULL;
return _backend->vpn_import_unavailable_reason();
}
void
-e_net_vpn_import(const char *file_path, E_Net_Import_Cb done_cb, void *data)
+enm_net_vpn_import(const char *file_path, E_Net_Import_Cb done_cb, void *data)
{
if (!_backend || !_backend->vpn_import)
{
@@ -577,7 +577,7 @@ e_net_vpn_import(const char *file_path, E_Net_Import_Cb done_cb, void *data)
/* Priority order here is load-bearing: it reproduces the string the popup
* subtitle and the lock overlay have always shown for a given AP. */
const char *
-e_net_security_to_str(unsigned int security)
+enm_net_security_to_str(unsigned int security)
{
if (security & E_NET_SEC_SAE) return "sae";
if (security & E_NET_SEC_8021X) return "802.1x";
@@ -588,9 +588,9 @@ e_net_security_to_str(unsigned int security)
}
const char *
-e_net_security_theme_signal(unsigned int security)
+enm_net_security_theme_signal(unsigned int security)
{
- const char *sec = e_net_security_to_str(security);
+ const char *sec = enm_net_security_to_str(security);
if (!strcmp(sec, "sae") || !strcmp(sec, "wpa2") || !strcmp(sec, "wpa"))
return "e,security,psk";
diff --git a/src/modules/networkmanager/e_net.h b/src/modules/networkmanager/enm_net.h
similarity index 78%
rename from src/modules/networkmanager/e_net.h
rename to src/modules/networkmanager/enm_net.h
index 779f77236..33164d45f 100644
--- a/src/modules/networkmanager/e_net.h
+++ b/src/modules/networkmanager/enm_net.h
@@ -1,5 +1,5 @@
-#ifndef E_NET_H
-#define E_NET_H
+#ifndef ENM_NET_H
+#define ENM_NET_H
#include "e.h"
@@ -187,75 +187,75 @@ struct _E_Net_Mod_Callbacks
void (*vpn_active_changed)(E_Net_Manager *mgr);
};
-void e_net_module_callbacks_set(const E_Net_Mod_Callbacks *cbs);
+void enm_net_module_callbacks_set(const E_Net_Mod_Callbacks *cbs);
/* Restrict backend selection to one named backend ("networkmanager" /
- * "connman"). NULL or "" means automatic. Call before e_net_init; the
+ * "connman"). NULL or "" means automatic. Call before enm_net_init; the
* E_NET_BACKEND environment variable overrides it. */
-void e_net_backend_preference_set(const char *name);
+void enm_net_backend_preference_set(const char *name);
-/* Lifecycle. e_net_init starts watching for daemons and binds the most
+/* Lifecycle. enm_net_init starts watching for daemons and binds the most
* preferred one that is present, now or later. */
-Eina_Bool e_net_init(void);
-void e_net_shutdown(void);
+Eina_Bool enm_net_init(void);
+void enm_net_shutdown(void);
/* Actions — thin dispatchers onto the bound backend, NULL-safe. */
-void e_net_scan(E_Net_Manager *mgr);
-void e_net_connect(E_Net_Manager *mgr, E_Net_Service *svc);
-void e_net_disconnect(E_Net_Manager *mgr, E_Net_Service *svc);
-void e_net_forget(E_Net_Manager *mgr, E_Net_Service *svc);
-void e_net_autoconnect_set(E_Net_Manager *mgr, E_Net_Service *svc,
+void enm_net_scan(E_Net_Manager *mgr);
+void enm_net_connect(E_Net_Manager *mgr, E_Net_Service *svc);
+void enm_net_disconnect(E_Net_Manager *mgr, E_Net_Service *svc);
+void enm_net_forget(E_Net_Manager *mgr, E_Net_Service *svc);
+void enm_net_autoconnect_set(E_Net_Manager *mgr, E_Net_Service *svc,
Eina_Bool on);
-void e_net_wifi_enabled_set(E_Net_Manager *mgr, Eina_Bool enabled);
+void enm_net_wifi_enabled_set(E_Net_Manager *mgr, Eina_Bool enabled);
-Eina_Bool e_net_vpn_import_supported(void);
-const char *e_net_vpn_import_unavailable_reason(void);
-void e_net_vpn_import(const char *file_path,
+Eina_Bool enm_net_vpn_import_supported(void);
+const char *enm_net_vpn_import_unavailable_reason(void);
+void enm_net_vpn_import(const char *file_path,
E_Net_Import_Cb done_cb, void *data);
/* Service list access. */
-E_Net_Service *e_net_service_find(E_Net_Manager *mgr, const char *id);
-unsigned int e_net_service_count(E_Net_Manager *mgr, E_Net_Type type);
-unsigned int e_net_vpn_active_count(E_Net_Manager *mgr);
+E_Net_Service *enm_net_service_find(E_Net_Manager *mgr, const char *id);
+unsigned int enm_net_service_count(E_Net_Manager *mgr, E_Net_Type type);
+unsigned int enm_net_vpn_active_count(E_Net_Manager *mgr);
/*
* Backend-facing helpers. Only backends call these; the UI does not.
*/
-E_Net_Service *e_net_service_new(E_Net_Manager *mgr, const char *id,
+E_Net_Service *enm_net_service_new(E_Net_Manager *mgr, const char *id,
E_Net_Type type);
-void e_net_service_del(E_Net_Manager *mgr, E_Net_Service *svc);
-void e_net_service_name_set(E_Net_Service *svc, const char *name);
-void e_net_service_iface_set(E_Net_Service *svc, const char *iface);
-void e_net_service_ip_set(E_Net_Service *svc, const char *ip);
+void enm_net_service_del(E_Net_Manager *mgr, E_Net_Service *svc);
+void enm_net_service_name_set(E_Net_Service *svc, const char *name);
+void enm_net_service_iface_set(E_Net_Service *svc, const char *iface);
+void enm_net_service_ip_set(E_Net_Service *svc, const char *ip);
/* Records prev_state and returns true when the value actually moved. */
-Eina_Bool e_net_service_state_set(E_Net_Service *svc, E_Net_State state);
+Eina_Bool enm_net_service_state_set(E_Net_Service *svc, E_Net_State state);
-E_Net_Manager *e_net_manager_new(const E_Net_Backend *backend);
-void e_net_manager_free(E_Net_Manager *mgr);
+E_Net_Manager *enm_net_manager_new(const E_Net_Backend *backend);
+void enm_net_manager_free(E_Net_Manager *mgr);
/* Replace the precomputed active-connection summary. `name` and `iface` are
* copied; pass NULL for `name` to mean "leave the gadget label alone". */
-void e_net_manager_active_set(E_Net_Manager *mgr, E_Net_Type type,
+void enm_net_manager_active_set(E_Net_Manager *mgr, E_Net_Type type,
const char *name, const char *iface,
uint8_t strength, unsigned int security,
uint16_t frequency);
/* Re-sort the service list into display order: ethernet, wifi, bluetooth,
* cellular, VPN; within a group, connected first then by descending
* strength, then by name. */
-void e_net_manager_sort(E_Net_Manager *mgr);
+void enm_net_manager_sort(E_Net_Manager *mgr);
/* Notifications a backend raises after mutating the model. */
-void e_net_notify_services_changed(E_Net_Manager *mgr);
-void e_net_notify_service_state_changed(E_Net_Manager *mgr);
-void e_net_notify_manager_update(E_Net_Manager *mgr);
-void e_net_notify_manager_inout(E_Net_Manager *mgr);
-void e_net_notify_vpn_active_changed(E_Net_Manager *mgr);
+void enm_net_notify_services_changed(E_Net_Manager *mgr);
+void enm_net_notify_service_state_changed(E_Net_Manager *mgr);
+void enm_net_notify_manager_update(E_Net_Manager *mgr);
+void enm_net_notify_manager_inout(E_Net_Manager *mgr);
+void enm_net_notify_vpn_active_changed(E_Net_Manager *mgr);
/* Utility. */
/* Highest-priority security name: "sae", "802.1x", "wpa2", "wpa", "wep" or
* "open". Never NULL. */
-const char *e_net_security_to_str(unsigned int security);
+const char *enm_net_security_to_str(unsigned int security);
/* Edje signal for the lock overlay, e.g. "e,security,psk". Never NULL. */
-const char *e_net_security_theme_signal(unsigned int security);
+const char *enm_net_security_theme_signal(unsigned int security);
/* Log */
extern int _e_nm_log_dom;
@@ -270,4 +270,4 @@ extern int _e_nm_log_dom;
#define WRN(...) EINA_LOG_DOM_WARN(_e_nm_log_dom, __VA_ARGS__)
#define ERR(...) EINA_LOG_DOM_ERR(_e_nm_log_dom, __VA_ARGS__)
-#endif /* E_NET_H */
+#endif /* ENM_NET_H */
diff --git a/src/modules/networkmanager/e_net_connman.c b/src/modules/networkmanager/enm_net_connman.c
similarity index 94%
rename from src/modules/networkmanager/e_net_connman.c
rename to src/modules/networkmanager/enm_net_connman.c
index cc139dcbc..ae14339d9 100644
--- a/src/modules/networkmanager/e_net_connman.c
+++ b/src/modules/networkmanager/enm_net_connman.c
@@ -1,10 +1,10 @@
#include "e.h"
#include <Eldbus.h>
-#include "e_net.h"
-#include "e_net_connman.h"
+#include "enm_net.h"
+#include "enm_net_connman.h"
/* Defined at the bottom of this file; referenced by the manager-in path. */
-extern const E_Net_Backend e_net_backend_connman;
+extern const E_Net_Backend enm_net_backend_connman;
/*
* ConnMan backend.
@@ -13,7 +13,7 @@ extern const E_Net_Backend e_net_backend_connman;
* Service already *is* a UI row — network and stored profile in one object,
* deduplicated and priority-ordered by the daemon — so there is no
* device/access-point graph to flatten and no separate settings store to
- * correlate. This file is correspondingly thinner than e_net_nm.c.
+ * correlate. This file is correspondingly thinner than enm_net_nm.c.
*
* Technologies (wifi, ethernet, bluetooth, ...) are tracked separately
* because that is where Powered and Scan() live.
@@ -40,7 +40,7 @@ typedef struct _Cm_Service
const char *path; /* stringshare */
Eldbus_Proxy *proxy;
Eldbus_Signal_Handler *prop_handler;
- E_Net_Service *svc; /* the neutral row; owned by e_net.c */
+ E_Net_Service *svc; /* the neutral row; owned by enm_net.c */
/* Proxy configuration as most recently reported. Held rather than
* applied on sight because whether it should reach the environment
@@ -309,14 +309,14 @@ _service_prop_apply(Cm_Service *cs, const char *key, Eldbus_Message_Iter *var)
const char *s;
if (!eldbus_message_iter_arguments_get(var, "s", &s)) return;
- e_net_service_state_set(svc, _state_map(s));
+ enm_net_service_state_set(svc, _state_map(s));
}
else if (!strcmp(key, "Name"))
{
const char *s;
if (!eldbus_message_iter_arguments_get(var, "s", &s)) return;
- e_net_service_name_set(svc, s);
+ enm_net_service_name_set(svc, s);
}
else if (!strcmp(key, "Type"))
{
@@ -368,14 +368,14 @@ _service_prop_apply(Cm_Service *cs, const char *key, Eldbus_Message_Iter *var)
Eldbus_Message_Iter *dict;
if (!eldbus_message_iter_arguments_get(var, "a{sv}", &dict)) return;
- e_net_service_iface_set(svc, _dict_str_get(dict, "Interface"));
+ enm_net_service_iface_set(svc, _dict_str_get(dict, "Interface"));
}
else if (!strcmp(key, "IPv4"))
{
Eldbus_Message_Iter *dict;
if (!eldbus_message_iter_arguments_get(var, "a{sv}", &dict)) return;
- e_net_service_ip_set(svc, _dict_str_get(dict, "Address"));
+ enm_net_service_ip_set(svc, _dict_str_get(dict, "Address"));
}
else if (!strcmp(key, "Provider"))
{
@@ -418,7 +418,7 @@ _service_prop_changed(void *data, const Eldbus_Message *msg)
_service_prop_apply(cs, key, var);
_proxy_sync();
- e_net_manager_sort(_mgr);
+ enm_net_manager_sort(_mgr);
/* State moves are what the user is waiting to see; everything else can
* ride the throttled path. */
@@ -429,13 +429,13 @@ _service_prop_changed(void *data, const Eldbus_Message *msg)
* without the manager's own State changing at all (roaming from one
* network to another stays "online" throughout). */
_active_summary_update();
- e_net_notify_manager_update(_mgr);
- e_net_notify_service_state_changed(_mgr);
+ enm_net_notify_manager_update(_mgr);
+ enm_net_notify_service_state_changed(_mgr);
if (cs->svc && cs->svc->type == E_NET_TYPE_VPN)
- e_net_notify_vpn_active_changed(_mgr);
+ enm_net_notify_vpn_active_changed(_mgr);
}
else
- e_net_notify_services_changed(_mgr);
+ enm_net_notify_services_changed(_mgr);
}
static Cm_Service *
@@ -451,7 +451,7 @@ _service_new(const char *path, Eldbus_Message_Iter *props)
cs->path = eina_stringshare_add(path);
snprintf(id, sizeof(id), "cm:%s", path);
- cs->svc = e_net_service_new(_mgr, id, E_NET_TYPE_UNKNOWN);
+ cs->svc = enm_net_service_new(_mgr, id, E_NET_TYPE_UNKNOWN);
if (!cs->svc)
{
eina_stringshare_del(cs->path);
@@ -484,7 +484,7 @@ _service_free(Cm_Service *cs)
eldbus_proxy_unref(cs->proxy);
if (obj) eldbus_object_unref(obj);
}
- if (cs->svc) e_net_service_del(_mgr, cs->svc);
+ if (cs->svc) enm_net_service_del(_mgr, cs->svc);
eina_stringshare_del(cs->path);
free(cs->proxy_cfg.servers);
free(cs->proxy_cfg.excludes);
@@ -533,7 +533,7 @@ _services_changed_apply(Eldbus_Message_Iter *changed,
}
}
- e_net_manager_sort(_mgr);
+ enm_net_manager_sort(_mgr);
_active_summary_update();
}
@@ -553,8 +553,8 @@ _cb_services_changed(void *data EINA_UNUSED, const Eldbus_Message *msg)
}
_services_changed_apply(changed, removed);
- e_net_notify_services_changed(_mgr);
- e_net_notify_manager_update(_mgr);
+ enm_net_notify_services_changed(_mgr);
+ enm_net_notify_manager_update(_mgr);
}
static void
@@ -578,8 +578,8 @@ _cb_get_services(void *data EINA_UNUSED, const Eldbus_Message *msg,
}
_services_changed_apply(array, NULL);
- e_net_notify_services_changed(_mgr);
- e_net_notify_manager_update(_mgr);
+ enm_net_notify_services_changed(_mgr);
+ enm_net_notify_manager_update(_mgr);
}
/* -------------------------------------------------------------------------- */
@@ -638,7 +638,7 @@ _tech_prop_changed(void *data, const Eldbus_Message *msg)
_tech_prop_apply(t, key, var);
_tech_summary_update();
- e_net_notify_services_changed(_mgr);
+ enm_net_notify_services_changed(_mgr);
}
static Cm_Technology *
@@ -702,7 +702,7 @@ _cb_tech_added(void *data EINA_UNUSED, const Eldbus_Message *msg)
if (!t) return;
_techs = eina_list_append(_techs, t);
_tech_summary_update();
- e_net_notify_services_changed(_mgr);
+ enm_net_notify_services_changed(_mgr);
}
static void
@@ -722,7 +722,7 @@ _cb_tech_removed(void *data EINA_UNUSED, const Eldbus_Message *msg)
break;
}
_tech_summary_update();
- e_net_notify_services_changed(_mgr);
+ enm_net_notify_services_changed(_mgr);
}
static void
@@ -754,7 +754,7 @@ _cb_get_technologies(void *data EINA_UNUSED, const Eldbus_Message *msg,
}
_tech_summary_update();
- e_net_notify_services_changed(_mgr);
+ enm_net_notify_services_changed(_mgr);
}
/* -------------------------------------------------------------------------- */
@@ -776,7 +776,7 @@ _mgr_prop_apply(const char *key, Eldbus_Message_Iter *var)
/* Recompute the active-connection summary the gadget reads. ConnMan has no
* "primary connection" property, so the highest-priority service that is up
* wins — which, given the daemon hands the list back in priority order and
- * e_net_manager_sort keeps connected services first, is the first one up. */
+ * enm_net_manager_sort keeps connected services first, is the first one up. */
static void
_active_summary_update(void)
{
@@ -794,11 +794,11 @@ _active_summary_update(void)
if (!best)
{
- e_net_manager_active_set(_mgr, E_NET_TYPE_UNKNOWN, "", NULL, 0, 0, 0);
+ enm_net_manager_active_set(_mgr, E_NET_TYPE_UNKNOWN, "", NULL, 0, 0, 0);
return;
}
- e_net_manager_active_set(_mgr, best->type, best->name ?: "", best->iface,
+ enm_net_manager_active_set(_mgr, best->type, best->name ?: "", best->iface,
best->strength, best->security, best->frequency);
}
@@ -806,7 +806,7 @@ static void
_mgr_changed_notify(void)
{
_active_summary_update();
- e_net_notify_manager_update(_mgr);
+ enm_net_notify_manager_update(_mgr);
}
static void
@@ -860,7 +860,7 @@ _manager_teardown(void)
if (_pending_techs) eldbus_pending_cancel(_pending_techs);
_pending_services = _pending_techs = NULL;
- ecm_agent_unregister(_mgr_proxy);
+ enm_cm_agent_unregister(_mgr_proxy);
/* Services must go before the manager: freeing one deletes its neutral
* row out of _mgr->services. */
@@ -883,7 +883,7 @@ _manager_teardown(void)
_proxy_clear();
- e_net_manager_free(_mgr);
+ enm_net_manager_free(_mgr);
_mgr = NULL;
}
@@ -892,7 +892,7 @@ _manager_setup(void)
{
Eldbus_Object *obj;
- _mgr = e_net_manager_new(&e_net_backend_connman);
+ _mgr = enm_net_manager_new(&enm_net_backend_connman);
if (!_mgr) return;
_services = eina_hash_string_superfast_new(_service_free_cb);
@@ -916,7 +916,7 @@ _manager_setup(void)
eldbus_proxy_call(_mgr_proxy, "GetProperties", _cb_get_properties,
NULL, -1, "");
- ecm_agent_register(_mgr_proxy);
+ enm_cm_agent_register(_mgr_proxy);
}
static void
@@ -928,14 +928,14 @@ _cb_name_owner_changed(void *data EINA_UNUSED, const char *bus EINA_UNUSED,
if (_mgr) return; /* already up */
INF("connman appeared");
_manager_setup();
- e_net_notify_manager_inout(_mgr);
+ enm_net_notify_manager_inout(_mgr);
}
else
{
if (!_mgr) return;
INF("connman vanished");
_manager_teardown();
- e_net_notify_manager_inout(NULL);
+ enm_net_notify_manager_inout(NULL);
}
}
@@ -969,7 +969,7 @@ _vpn_setup(void)
return;
}
- ecm_vpn_agent_register(_vpn_proxy);
+ enm_cm_vpn_agent_register(_vpn_proxy);
}
static void
@@ -1035,7 +1035,7 @@ _be_init(void)
return EINA_FALSE;
}
- ecm_agent_init(_conn);
+ enm_cm_agent_init(_conn);
eldbus_name_owner_changed_callback_add(_conn, CM_BUS,
_cb_name_owner_changed, NULL,
@@ -1059,10 +1059,10 @@ _be_shutdown(void)
_cb_vpn_name_owner_changed,
NULL);
}
- ecm_vpn_agent_unregister(_vpn_proxy);
+ enm_cm_vpn_agent_unregister(_vpn_proxy);
_vpn_teardown();
_manager_teardown();
- ecm_agent_shutdown();
+ enm_cm_agent_shutdown();
if (_conn)
{
@@ -1170,7 +1170,7 @@ _be_vpn_import_unavailable_reason(void)
"/var/lib/connman-vpn, which requires administrator rights.");
}
-const E_Net_Backend e_net_backend_connman =
+const E_Net_Backend enm_net_backend_connman =
{
.name = "connman",
.bus_name = CM_BUS,
diff --git a/src/modules/networkmanager/e_net_connman.h b/src/modules/networkmanager/enm_net_connman.h
similarity index 59%
rename from src/modules/networkmanager/e_net_connman.h
rename to src/modules/networkmanager/enm_net_connman.h
index b3d3e1101..edaa67b41 100644
--- a/src/modules/networkmanager/e_net_connman.h
+++ b/src/modules/networkmanager/enm_net_connman.h
@@ -1,5 +1,5 @@
-#ifndef E_NET_CONNMAN_H
-#define E_NET_CONNMAN_H
+#ifndef ENM_NET_CONNMAN_H
+#define ENM_NET_CONNMAN_H
#include <Eldbus.h>
@@ -15,17 +15,17 @@
* Main thread only.
*/
-void ecm_agent_init(Eldbus_Connection *conn);
-void ecm_agent_shutdown(void);
+void enm_cm_agent_init(Eldbus_Connection *conn);
+void enm_cm_agent_shutdown(void);
/* Hand the agent object path to connman, and take it back. Both are safe to
* call with a NULL proxy. */
-void ecm_agent_register(Eldbus_Proxy *mgr_proxy);
-void ecm_agent_unregister(Eldbus_Proxy *mgr_proxy);
+void enm_cm_agent_register(Eldbus_Proxy *mgr_proxy);
+void enm_cm_agent_unregister(Eldbus_Proxy *mgr_proxy);
/* Same, for the separate agent connman-vpnd asks for VPN credentials on.
- * ecm_agent_init() exports both; these take the vpn manager proxy. */
-void ecm_vpn_agent_register(Eldbus_Proxy *vpn_proxy);
-void ecm_vpn_agent_unregister(Eldbus_Proxy *vpn_proxy);
+ * enm_cm_agent_init() exports both; these take the vpn manager proxy. */
+void enm_cm_vpn_agent_register(Eldbus_Proxy *vpn_proxy);
+void enm_cm_vpn_agent_unregister(Eldbus_Proxy *vpn_proxy);
-#endif /* E_NET_CONNMAN_H */
+#endif /* ENM_NET_CONNMAN_H */
diff --git a/src/modules/networkmanager/e_net_connman_agent.c b/src/modules/networkmanager/enm_net_connman_agent.c
similarity index 98%
rename from src/modules/networkmanager/e_net_connman_agent.c
rename to src/modules/networkmanager/enm_net_connman_agent.c
index 8103e48cc..23f408f25 100644
--- a/src/modules/networkmanager/e_net_connman_agent.c
+++ b/src/modules/networkmanager/enm_net_connman_agent.c
@@ -1,11 +1,11 @@
#include "e.h"
#include <Eldbus.h>
-#include "e_net.h"
+#include "enm_net.h"
#include "e_mod_main.h"
-#include "e_net_connman.h"
+#include "enm_net_connman.h"
/*
- * ConnMan secret agent — see e_net_connman.h.
+ * ConnMan secret agent — see enm_net_connman.h.
*
* Adapted from the old connman module's agent. ConnMan's RequestInput
* describes the fields it wants rather than naming a fixed credential, so
@@ -599,7 +599,7 @@ _agent_free(Cm_Agent **agentp)
}
void
-ecm_agent_init(Eldbus_Connection *conn)
+enm_cm_agent_init(Eldbus_Connection *conn)
{
if (_agent) return;
@@ -612,7 +612,7 @@ ecm_agent_init(Eldbus_Connection *conn)
}
void
-ecm_agent_shutdown(void)
+enm_cm_agent_shutdown(void)
{
_agent_free(&_agent);
_agent_free(&_vpn_agent);
@@ -634,7 +634,7 @@ _cb_register(void *data, const Eldbus_Message *msg,
}
void
-ecm_agent_register(Eldbus_Proxy *mgr_proxy)
+enm_cm_agent_register(Eldbus_Proxy *mgr_proxy)
{
if (!mgr_proxy || !_agent) return;
eldbus_proxy_call(mgr_proxy, "RegisterAgent", _cb_register, "connman", -1,
@@ -642,7 +642,7 @@ ecm_agent_register(Eldbus_Proxy *mgr_proxy)
}
void
-ecm_agent_unregister(Eldbus_Proxy *mgr_proxy)
+enm_cm_agent_unregister(Eldbus_Proxy *mgr_proxy)
{
if (!mgr_proxy || !_agent) return;
eldbus_proxy_call(mgr_proxy, "UnregisterAgent", NULL, NULL, -1,
@@ -650,7 +650,7 @@ ecm_agent_unregister(Eldbus_Proxy *mgr_proxy)
}
void
-ecm_vpn_agent_register(Eldbus_Proxy *vpn_proxy)
+enm_cm_vpn_agent_register(Eldbus_Proxy *vpn_proxy)
{
if (!vpn_proxy || !_vpn_agent) return;
eldbus_proxy_call(vpn_proxy, "RegisterAgent", _cb_register, "connman vpn",
@@ -658,7 +658,7 @@ ecm_vpn_agent_register(Eldbus_Proxy *vpn_proxy)
}
void
-ecm_vpn_agent_unregister(Eldbus_Proxy *vpn_proxy)
+enm_cm_vpn_agent_unregister(Eldbus_Proxy *vpn_proxy)
{
if (!vpn_proxy || !_vpn_agent) return;
eldbus_proxy_call(vpn_proxy, "UnregisterAgent", NULL, NULL, -1,
diff --git a/src/modules/networkmanager/e_net_nm.c b/src/modules/networkmanager/enm_net_nm.c
similarity index 92%
rename from src/modules/networkmanager/e_net_nm.c
rename to src/modules/networkmanager/enm_net_nm.c
index 43e29ac6f..08caa39b3 100644
--- a/src/modules/networkmanager/e_net_nm.c
+++ b/src/modules/networkmanager/enm_net_nm.c
@@ -1,5 +1,5 @@
#include "e.h"
-#include "e_net.h"
+#include "enm_net.h"
#include "e_mod_main.h"
#include "e_networkmanager.h"
#include "e_networkmanager_vpn.h"
@@ -7,7 +7,7 @@
#include "e_networkmanager_vpn_username.h"
/* Defined at the bottom of this file; referenced by the manager-in path. */
-extern const E_Net_Backend e_net_backend_nm;
+extern const E_Net_Backend enm_net_backend_nm;
/*
* NetworkManager backend.
@@ -32,7 +32,7 @@ extern const E_Net_Backend e_net_backend_nm;
*/
static struct NM_Manager *_nm; /* NM-side model, owned by e_networkmanager.c */
-static E_Net_Manager *_mgr; /* neutral model, owned by e_net.c */
+static E_Net_Manager *_mgr; /* neutral model, owned by enm_net.c */
static Ecore_Job *_vpn_update_job; /* see enm_vpn_active_changed_schedule */
/* -------------------------------------------------------------------------- */
@@ -101,7 +101,7 @@ _svc_claim(Eina_Hash *unseen, const char *id, E_Net_Type type)
eina_hash_del(unseen, id, svc);
return svc;
}
- return e_net_service_new(_mgr, id, type);
+ return enm_net_service_new(_mgr, id, type);
}
static void
@@ -124,9 +124,9 @@ _project_ethernet(Eina_Hash *unseen)
svc = _svc_claim(unseen, id, E_NET_TYPE_ETHERNET);
if (!svc) continue;
- e_net_service_name_set(svc, dev->interface ?: _("Wired"));
- e_net_service_iface_set(svc, dev->interface);
- e_net_service_state_set(svc,
+ enm_net_service_name_set(svc, dev->interface ?: _("Wired"));
+ enm_net_service_iface_set(svc, dev->interface);
+ enm_net_service_state_set(svc,
(dev->state >= NM_DEVICE_STATE_ACTIVATED) ? E_NET_STATE_ONLINE
: E_NET_STATE_IDLE);
svc->strength = 100;
@@ -137,9 +137,9 @@ _project_ethernet(Eina_Hash *unseen)
/* The manager-wide IP belongs to whichever technology is primary. */
if ((_nm->active_conn_type == NM_DEVICE_TYPE_ETHERNET) &&
(_nm->state >= NM_STATE_CONNECTED_LOCAL))
- e_net_service_ip_set(svc, _nm->ip_address);
+ enm_net_service_ip_set(svc, _nm->ip_address);
else
- e_net_service_ip_set(svc, NULL);
+ enm_net_service_ip_set(svc, NULL);
}
}
@@ -178,8 +178,8 @@ _project_wifi(Eina_Hash *unseen)
active = enm_ssid_is_active(_nm, best->ssid);
- e_net_service_name_set(svc, best->ssid);
- e_net_service_state_set(svc, active ? E_NET_STATE_ONLINE
+ enm_net_service_name_set(svc, best->ssid);
+ enm_net_service_state_set(svc, active ? E_NET_STATE_ONLINE
: E_NET_STATE_IDLE);
svc->strength = best->strength;
svc->frequency = best->frequency;
@@ -189,8 +189,8 @@ _project_wifi(Eina_Hash *unseen)
best->ssid));
svc->priv = best;
- e_net_service_iface_set(svc, active ? dev->interface : NULL);
- e_net_service_ip_set(svc, active ? _nm->ip_address : NULL);
+ enm_net_service_iface_set(svc, active ? dev->interface : NULL);
+ enm_net_service_ip_set(svc, active ? _nm->ip_address : NULL);
}
}
@@ -225,9 +225,9 @@ _project_bluetooth(Eina_Hash *unseen)
_nm->active_connection_path && dev->active_conn_path &&
!strcmp(_nm->active_connection_path, dev->active_conn_path);
- e_net_service_name_set(svc, bc->name ?: _("Bluetooth"));
- e_net_service_iface_set(svc, dev->interface);
- e_net_service_state_set(svc, active ? E_NET_STATE_ONLINE
+ enm_net_service_name_set(svc, bc->name ?: _("Bluetooth"));
+ enm_net_service_iface_set(svc, dev->interface);
+ enm_net_service_state_set(svc, active ? E_NET_STATE_ONLINE
: E_NET_STATE_IDLE);
svc->strength = 100;
svc->security = E_NET_SEC_NONE;
@@ -235,7 +235,7 @@ _project_bluetooth(Eina_Hash *unseen)
svc->saved = EINA_FALSE;
svc->priv = dev;
- e_net_service_ip_set(svc, active ? _nm->ip_address : NULL);
+ enm_net_service_ip_set(svc, active ? _nm->ip_address : NULL);
}
}
@@ -255,8 +255,8 @@ _project_vpn(Eina_Hash *unseen)
svc = _svc_claim(unseen, id, E_NET_TYPE_VPN);
if (!svc) continue;
- e_net_service_name_set(svc, vc->name ?: _("VPN"));
- e_net_service_state_set(svc, _vpn_state_map(vc->vpn_state));
+ enm_net_service_name_set(svc, vc->name ?: _("VPN"));
+ enm_net_service_state_set(svc, _vpn_state_map(vc->vpn_state));
svc->fail_reason = vc->fail_reason;
svc->autoconnect = vc->autoconnect;
svc->saved = EINA_TRUE;
@@ -264,7 +264,7 @@ _project_vpn(Eina_Hash *unseen)
svc->vpn_kind = enm_vpn_type_label(vc->conn_type, vc->service_type);
svc->priv = vc;
- e_net_service_ip_set(svc, vc->active_path ? vc->ip_address : NULL);
+ enm_net_service_ip_set(svc, vc->active_path ? vc->ip_address : NULL);
}
}
@@ -294,7 +294,7 @@ _project(void)
itr = eina_hash_iterator_data_new(unseen);
EINA_ITERATOR_FOREACH(itr, svc) dead = eina_list_append(dead, svc);
eina_iterator_free(itr);
- EINA_LIST_FREE(dead, svc) e_net_service_del(_mgr, svc);
+ EINA_LIST_FREE(dead, svc) enm_net_service_del(_mgr, svc);
eina_hash_free(unseen);
@@ -306,7 +306,7 @@ _project(void)
{
struct NM_Access_Point *ap = enm_active_ap_get(_nm);
- e_net_manager_active_set(_mgr,
+ enm_net_manager_active_set(_mgr,
_device_type_map(_nm->active_conn_type),
enm_active_name_get(_nm),
enm_active_interface_get(_nm),
@@ -316,7 +316,7 @@ _project(void)
ap ? ap->frequency : 0);
}
- e_net_manager_sort(_mgr);
+ enm_net_manager_sort(_mgr);
}
/* -------------------------------------------------------------------------- */
@@ -327,14 +327,14 @@ static void
_cb_aps_changed(struct NM_Manager *nm EINA_UNUSED)
{
_project();
- e_net_notify_services_changed(_mgr);
+ enm_net_notify_services_changed(_mgr);
}
static void
_cb_manager_update(struct NM_Manager *nm EINA_UNUSED)
{
_project();
- e_net_notify_manager_update(_mgr);
+ enm_net_notify_manager_update(_mgr);
}
static void
@@ -344,7 +344,7 @@ _cb_manager_inout(struct NM_Manager *nm)
if (nm)
{
- if (!_mgr) _mgr = e_net_manager_new(&e_net_backend_nm);
+ if (!_mgr) _mgr = enm_net_manager_new(&enm_net_backend_nm);
_project();
/* Warm the saved-connection store so the Forget buttons are right
* the first time the popup opens. */
@@ -354,25 +354,25 @@ _cb_manager_inout(struct NM_Manager *nm)
{
/* Nothing left for a queued refresh to look at. */
E_FREE_FUNC(_vpn_update_job, ecore_job_del);
- e_net_manager_free(_mgr);
+ enm_net_manager_free(_mgr);
_mgr = NULL;
}
- e_net_notify_manager_inout(_mgr);
+ enm_net_notify_manager_inout(_mgr);
}
static void
_cb_vpn_changed(struct NM_Manager *nm EINA_UNUSED)
{
_project();
- e_net_notify_service_state_changed(_mgr);
+ enm_net_notify_service_state_changed(_mgr);
}
static void
_cb_vpn_active_changed(struct NM_Manager *nm EINA_UNUSED)
{
_project();
- e_net_notify_vpn_active_changed(_mgr);
+ enm_net_notify_vpn_active_changed(_mgr);
}
/* -------------------------------------------------------------------------- */
@@ -471,7 +471,7 @@ _be_shutdown(void)
e_nm_system_shutdown();
e_nm_module_callbacks_set(NULL);
e_nm_agent_callbacks_set(NULL, NULL);
- e_net_manager_free(_mgr);
+ enm_net_manager_free(_mgr);
_mgr = NULL;
_nm = NULL;
}
@@ -698,7 +698,7 @@ _be_vpn_import(const char *file_path, E_Net_Import_Cb done_cb, void *data)
enm_import_run(type, file_path, _nm_import_done, ctx);
}
-const E_Net_Backend e_net_backend_nm =
+const E_Net_Backend enm_net_backend_nm =
{
.name = "networkmanager",
.bus_name = NM_BUS_NAME,
diff --git a/src/modules/networkmanager/meson.build b/src/modules/networkmanager/meson.build
index 31791888c..bb30ffcfc 100644
--- a/src/modules/networkmanager/meson.build
+++ b/src/modules/networkmanager/meson.build
@@ -2,12 +2,12 @@ src = ""
'e_mod_main.c',
'e_mod_config.c',
'agent.c',
- 'e_net.c',
- 'e_net.h',
- 'e_net_nm.c',
- 'e_net_connman.c',
- 'e_net_connman.h',
- 'e_net_connman_agent.c',
+ 'enm_net.c',
+ 'enm_net.h',
+ 'enm_net_nm.c',
+ 'enm_net_connman.c',
+ 'enm_net_connman.h',
+ 'enm_net_connman_agent.c',
'e_networkmanager.c',
'e_networkmanager.h',
'e_networkmanager_vpn.c',
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
