This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch nm-vpn-username-capture
in repository enlightenment.
View the commit online.
commit 96899fcbdf3e8df3c79366707e8c6a30f87ce9a9
Author: [email protected] <[email protected]>
AuthorDate: Sun Jun 21 22:44:03 2026 -0600
networkmanager: size username dialog entry + drop debug traces
Add a transparent column spacer so the username entry gets ~25 chars of
width instead of collapsing to one character in the elm_table cell, and
pass a min content width to the dialog. Remove the ENM-DBG fprintf traces
and the temporary import INF now that the post-import prompt works.
Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected]>
---
src/modules/networkmanager/e_mod_main.c | 2 --
.../networkmanager/e_networkmanager_import.c | 1 -
.../networkmanager/e_networkmanager_vpn_username.c | 35 +++++++++++-----------
3 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/src/modules/networkmanager/e_mod_main.c b/src/modules/networkmanager/e_mod_main.c
index 62e90fbf4..0ac6e8f5b 100644
--- a/src/modules/networkmanager/e_mod_main.c
+++ b/src/modules/networkmanager/e_mod_main.c
@@ -414,8 +414,6 @@ _enm_vpn_import_done_cb(void *data, Eina_Bool ok, const char *err,
E_Dialog *err_dlg;
if (ok)
{
- fprintf(stderr, "ENM-DBG import_done ok: conn(uuid)=%s type=%s\n",
- conn_name ?: "(null)", type ?: "(null)"); fflush(stderr);
if (conn_name) enm_vpn_username_maybe_prompt(conn_name, type);
return;
}
diff --git a/src/modules/networkmanager/e_networkmanager_import.c b/src/modules/networkmanager/e_networkmanager_import.c
index 1fe67fa0b..d3cb109d2 100644
--- a/src/modules/networkmanager/e_networkmanager_import.c
+++ b/src/modules/networkmanager/e_networkmanager_import.c
@@ -179,7 +179,6 @@ _on_del(void *data, int type EINA_UNUSED, void *event)
char *conn_uuid = ok ? _import_parse_conn_uuid(
eina_strbuf_string_get(ctx->stdout_buf)) : NULL;
- INF("VPN import done: ok=%d uuid=%s", ok, conn_uuid ?: "(none)");
ctx->done_cb(ctx->data, ok, stderr_text, conn_uuid);
free(conn_uuid);
diff --git a/src/modules/networkmanager/e_networkmanager_vpn_username.c b/src/modules/networkmanager/e_networkmanager_vpn_username.c
index 2ec3f7f5a..5b1eb9557 100644
--- a/src/modules/networkmanager/e_networkmanager_vpn_username.c
+++ b/src/modules/networkmanager/e_networkmanager_vpn_username.c
@@ -116,7 +116,6 @@ enm_vpn_username_set(const char *conn_name, const char *username,
"'%s' connection modify '%s' +vpn.data 'username=%s'",
esc_nmcli, esc_name, esc_user);
free(esc_nmcli); free(esc_name); free(esc_user);
- fprintf(stderr, "ENM-DBG username write: %s\n", cmd); fflush(stderr);
ctx = calloc(1, sizeof(*ctx));
if (!ctx) { if (cb) cb(data, EINA_FALSE); return; }
@@ -203,11 +202,10 @@ enm_vpn_username_dialog(const char *conn_name, const char *type_label,
{
Username_Dialog *ud;
E_Dialog *dialog;
- Evas_Object *frame, *table, *label, *entry;
+ Evas_Object *frame, *table, *label, *entry, *spacer;
+ Evas_Coord minw = 280 * e_scale;
char header[160];
- fprintf(stderr, "ENM-DBG dialog show: '%s' (%s)\n",
- conn_name ?: "?", type_label ?: "?"); fflush(stderr);
dialog = e_dialog_new(NULL, "E", "nm_vpn_username");
if (!dialog) { if (cb) cb(data, NULL); return; }
@@ -235,10 +233,21 @@ enm_vpn_username_dialog(const char *conn_name, const char *type_label,
elm_object_content_set(frame, table);
evas_object_show(table);
+ /* Transparent spacer forces the entry column to a usable width (~25 chars);
+ * a scrollable single-line entry otherwise collapses to one character in an
+ * elm_table cell. */
+ spacer = evas_object_rectangle_add(evas_object_evas_get(table));
+ evas_object_color_set(spacer, 0, 0, 0, 0);
+ evas_object_size_hint_min_set(spacer, minw, 1);
+ evas_object_size_hint_weight_set(spacer, EVAS_HINT_EXPAND, 0);
+ evas_object_size_hint_align_set(spacer, EVAS_HINT_FILL, 0.0);
+ elm_table_pack(table, spacer, 1, 0, 1, 1);
+ evas_object_show(spacer);
+
label = elm_label_add(table);
elm_object_text_set(label, _("Username"));
evas_object_size_hint_align_set(label, 1.0, 0.5);
- elm_table_pack(table, label, 0, 0, 1, 1);
+ elm_table_pack(table, label, 0, 1, 1, 1);
evas_object_show(label);
entry = elm_entry_add(table);
@@ -247,15 +256,15 @@ enm_vpn_username_dialog(const char *conn_name, const char *type_label,
if (initial && initial[0]) elm_object_text_set(entry, initial);
evas_object_size_hint_weight_set(entry, EVAS_HINT_EXPAND, 0);
evas_object_size_hint_align_set(entry, EVAS_HINT_FILL, 0.5);
- evas_object_size_hint_min_set(entry, 240 * e_scale, 0);
+ evas_object_size_hint_min_set(entry, minw, 0);
evas_object_smart_callback_add(entry, "activated",
_username_entry_activated_cb, ud);
- elm_table_pack(table, entry, 1, 0, 1, 1);
+ elm_table_pack(table, entry, 1, 1, 1, 1);
evas_object_show(entry);
ud->entry = entry;
evas_object_show(frame);
- e_dialog_content_set(dialog, frame, 0, 0);
+ e_dialog_content_set(dialog, frame, minw, 0);
e_dialog_show(dialog);
evas_object_event_callback_add(dialog->bg_object, EVAS_CALLBACK_KEY_DOWN,
@@ -353,11 +362,6 @@ _probe_on_del(void *data, int type EINA_UNUSED, void *event)
username = _nmcli_kv_find(blob, "username");
needed = enm_vpn_username_needed(ctx->svc, conn_type, username);
- fprintf(stderr, "ENM-DBG probe result: svc=%s conn_type=%s "
- "username=%s needed=%d blob_len=%zu\n",
- ctx->svc ?: "(null)", conn_type ?: "(null)",
- username ?: "(null)", (int)needed, strlen(blob));
- fflush(stderr);
if (needed)
{
@@ -384,11 +388,9 @@ enm_vpn_username_maybe_prompt(const char *conn_uuid, const char *svc_short)
char *esc_nmcli, *esc_uuid, cmd[4096];
Username_Probe_Ctx *ctx;
- fprintf(stderr, "ENM-DBG maybe_prompt: uuid=%s svc=%s\n",
- conn_uuid ?: "(null)", svc_short ?: "(null)"); fflush(stderr);
if (!conn_uuid) return;
nmcli = enm_import_nmcli_path();
- if (!nmcli) { fprintf(stderr, "ENM-DBG maybe_prompt: nmcli NULL\n"); fflush(stderr); return; }
+ if (!nmcli) return;
esc_nmcli = _username_shell_escape(nmcli);
esc_uuid = _username_shell_escape(conn_uuid);
@@ -402,7 +404,6 @@ enm_vpn_username_maybe_prompt(const char *conn_uuid, const char *svc_short)
"LC_ALL=C '%s' -g vpn.data connection show '%s'",
esc_nmcli, esc_uuid);
free(esc_nmcli); free(esc_uuid);
- fprintf(stderr, "ENM-DBG probe spawn: %s\n", cmd); fflush(stderr);
ctx = calloc(1, sizeof(*ctx));
if (!ctx) return;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
