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 6fccf3ca6e4b036ae7e5127da38d2e16a362af10
Author: Cedric BAIL <[email protected]>
AuthorDate: Mon Aug 3 13:53:22 2026 -0600
networkmanager - stop presenting itself as NetworkManager only
The module drives ConnMan just as well now, so naming one of the two
daemons in the module list, the gadget label and the settings dialog is
wrong for half its users.
Only display strings change. The gadcon client class and the module name
in e_config stay "networkmanager" - those are identity, and moving them
would strand existing configuration.
Co-Authored-By: Claude Opus 5 <[email protected]>
---
src/modules/networkmanager/e_mod_config.c | 2 +-
src/modules/networkmanager/e_mod_main.c | 6 +++++-
src/modules/networkmanager/e_mod_main.h | 8 +++++---
src/modules/networkmanager/module.desktop | 10 +++++-----
4 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/src/modules/networkmanager/e_mod_config.c b/src/modules/networkmanager/e_mod_config.c
index ef440d5b0..8997512e6 100644
--- a/src/modules/networkmanager/e_mod_config.c
+++ b/src/modules/networkmanager/e_mod_config.c
@@ -34,7 +34,7 @@ e_int_config_networkmanager_module(Evas_Object *parent EINA_UNUSED,
v->basic.create_widgets = _basic_create_widgets;
v->basic.check_changed = _basic_check_changed;
- cfd = e_config_dialog_new(NULL, _("NetworkManager Settings"),
+ cfd = e_config_dialog_new(NULL, _("Network Settings"),
"E", "_e_mod_networkmanager_config_dialog",
"preferences-network", 0, v, NULL);
networkmanager_config->config_dialog = cfd;
diff --git a/src/modules/networkmanager/e_mod_main.c b/src/modules/networkmanager/e_mod_main.c
index c094c4129..638dfad99 100644
--- a/src/modules/networkmanager/e_mod_main.c
+++ b/src/modules/networkmanager/e_mod_main.c
@@ -7,8 +7,12 @@ static Eina_Stringshare *_theme_path = NULL;
static E_Config_DD *conf_edd = NULL;
static E_Config_DD *saved_field_edd = NULL;
+/* _e_nm_name is an identity: the gadcon client class and the module name in
+ * e_config. It must stay "networkmanager" or existing configuration breaks.
+ * _e_nm_Name is only ever shown to the user, and the module drives ConnMan
+ * just as well as NetworkManager, so it does not name either. */
const char _e_nm_name[] = "networkmanager";
-const char _e_nm_Name[] = N_("NetworkManager");
+const char _e_nm_Name[] = N_("Network");
int _e_nm_log_dom = -1;
/* Forward declarations for traffic monitor */
diff --git a/src/modules/networkmanager/e_mod_main.h b/src/modules/networkmanager/e_mod_main.h
index 42c61c9bf..9521895bd 100644
--- a/src/modules/networkmanager/e_mod_main.h
+++ b/src/modules/networkmanager/e_mod_main.h
@@ -128,12 +128,14 @@ extern E_NM_Config *networkmanager_config;
* @addtogroup Optional_Devices
* @{
*
- * @defgroup Module_NetworkManager NetworkManager
+ * @defgroup Module_NetworkManager Network
*
- * Controls network connections for ethernet, wifi, bluetooth
- * and mobile broadband via the NetworkManager D-Bus API.
+ * Controls network connections for ethernet, wifi, bluetooth, mobile
+ * broadband and VPN, through whichever of NetworkManager or ConnMan is
+ * running.
*
* @see https://networkmanager.dev/
+ * @see https://git.kernel.org/pub/scm/network/connman/connman.git/
* @}
*/
diff --git a/src/modules/networkmanager/module.desktop b/src/modules/networkmanager/module.desktop
index aae777fdf..0ed9aa77c 100644
--- a/src/modules/networkmanager/module.desktop
+++ b/src/modules/networkmanager/module.desktop
@@ -1,9 +1,9 @@
[Desktop Entry]
Type=Link
-Name=NetworkManager
-GenericName=NetworkManager
-Comment=Control Wifi and wired networks via NetworkManager.
-Comment[fr]=Permet de contrôler les réseaux Wi-Fi et filaires via NetworkManager.
-Comment[it]=Controlla le reti cablate e Wifi mediante NetworkManager.
+Name=Network
+GenericName=Network
+Comment=Control Wifi, wired and VPN connections via NetworkManager or ConnMan.
+Comment[fr]=Permet de contrôler les connexions Wi-Fi, filaires et VPN via NetworkManager ou ConnMan.
+Comment[it]=Controlla le connessioni Wifi, cablate e VPN mediante NetworkManager o ConnMan.
Icon=e-module-networkmanager
X-Enlightenment-ModuleType=system
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
