colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tui: quit from top-level form when exiting

Browse Source 
The top-level form was left on screen after exit (this is visible only
on some types of terminal as vt100), breaking automated tests.

Fixes: b2fb80928e
This commit is contained in:
Beniamino Galvani
2016-04-26 23:22:07 +02:00
parent 767fa0ed3d
commit f4f9c9fa3c
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
clients/tui/nmtui.c
View File

@@ -61,6 +61,18 @@ static const struct {
nmtui_hostname } nmtui_hostname }
}; };
static const int num_subprograms = G_N_ELEMENTS (subprograms); static const int num_subprograms = G_N_ELEMENTS (subprograms);
static NmtNewtForm *toplevel_form;
static NmtNewtForm *
quit_func (int argc, char **argv)
{
if (toplevel_form)
nmt_newt_form_quit (toplevel_form);
nmtui_quit ();
return NULL;
}
static void static void
main_list_activated (NmtNewtWidget *widget, NmtNewtListbox *listbox) main_list_activated (NmtNewtWidget *widget, NmtNewtListbox *listbox)
@@ -115,7 +127,7 @@ nmtui_main (gboolean is_top, int argc, char **argv)
subprograms[i].func); subprograms[i].func);
} }
nmt_newt_listbox_append (listbox, "", NULL); nmt_newt_listbox_append (listbox, "", NULL);
nmt_newt_listbox_append (listbox, _("Quit"), nmtui_quit); nmt_newt_listbox_append (listbox, _("Quit"), quit_func);
widget = nmt_newt_button_box_new (NMT_NEWT_BUTTON_BOX_HORIZONTAL); widget = nmt_newt_button_box_new (NMT_NEWT_BUTTON_BOX_HORIZONTAL);
nmt_newt_grid_add (grid, widget, 0, 2); nmt_newt_grid_add (grid, widget, 0, 2);
@@ -125,6 +137,8 @@ nmtui_main (gboolean is_top, int argc, char **argv)
g_signal_connect (ok, "activated", g_signal_connect (ok, "activated",
G_CALLBACK (main_list_activated), listbox); G_CALLBACK (main_list_activated), listbox);
toplevel_form = form;
return form; return form;
} }