fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 19:28:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

tui: don't use GIOChannel to watch plain file descriptor for key press

Browse source
This commit is contained in:
Thomas Haller 2020-01-01 09:54:23 +01:00
parent a3b29b06dc
commit 9cc6d3a26d
1 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
clients/tui/newt/nmt-newt-form.c
View file

@ -312,9 +312,9 @@ static GSList *form_stack;
static GSource *keypress_source; static GSource *keypress_source;
static gboolean static gboolean
nmt_newt_form_keypress_callback (GIOChannel *channel, nmt_newt_form_keypress_callback (int fd,
GIOCondition condition, GIOCondition condition,
gpointer user_data) gpointer user_data)
{ {
g_return_val_if_fail (form_stack != NULL, FALSE); g_return_val_if_fail (form_stack != NULL, FALSE);
@ -340,16 +340,14 @@ static void
nmt_newt_form_real_show (NmtNewtForm *form) nmt_newt_form_real_show (NmtNewtForm *form)
{ {
if (!keypress_source) { if (!keypress_source) {
GIOChannel *io; keypress_source = nm_g_unix_fd_source_new (STDIN_FILENO,
G_IO_IN,
io = g_io_channel_unix_new (STDIN_FILENO); G_PRIORITY_DEFAULT,
keypress_source = g_io_create_watch (io, G_IO_IN); nmt_newt_form_keypress_callback,
NULL,
NULL);
g_source_set_can_recurse (keypress_source, TRUE); g_source_set_can_recurse (keypress_source, TRUE);
g_source_set_callback (keypress_source,
(GSourceFunc)(void (*) (void)) nmt_newt_form_keypress_callback,
NULL, NULL);
g_source_attach (keypress_source, NULL); g_source_attach (keypress_source, NULL);
g_io_channel_unref (io);
} }
nmt_newt_form_build (form); nmt_newt_form_build (form);
@ -416,10 +414,8 @@ nmt_newt_form_quit (NmtNewtForm *form)
if (form_stack) if (form_stack)
nmt_newt_form_iterate (form_stack->data); nmt_newt_form_iterate (form_stack->data);
else if (keypress_source) { else
g_source_destroy (keypress_source); nm_clear_g_source_inst (&keypress_source);
g_clear_pointer (&keypress_source, g_source_unref);
}
g_signal_emit (form, signals[QUIT], 0); g_signal_emit (form, signals[QUIT], 0);
g_object_unref (form); g_object_unref (form);