summary refs log tree commit diff
path: root/clients/tui
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2016-08-03 22:59:23 +0200
committerMichael Biebl <biebl@debian.org>2016-08-03 22:59:23 +0200
commitd6201f5d8daada3d64a0a3e0038e14eebec683ce (patch)
tree035500728cc23e7ee5368c3fd605270265a077f7 /clients/tui
parent73e152af6e3fb4f5848bfb8394484026ff119003 (diff)
Imported Upstream version 1.2.4 upstream/1.2.4
Diffstat (limited to 'clients/tui')
-rw-r--r--clients/tui/Makefile.in1
-rw-r--r--clients/tui/newt/Makefile.in1
-rw-r--r--clients/tui/nmtui-edit.c9
3 files changed, 9 insertions, 2 deletions
diff --git a/clients/tui/Makefile.in b/clients/tui/Makefile.in
index 82b89bdd..d7773283 100644
--- a/clients/tui/Makefile.in
+++ b/clients/tui/Makefile.in
@@ -429,6 +429,7 @@ NEWT_LIBS = @NEWT_LIBS@
 NM = @NM@
 NMEDIT = @NMEDIT@
 NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT = @NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT@
+NM_CONFIG_DEFAULT_DNS_RC_MANAGER = @NM_CONFIG_DEFAULT_DNS_RC_MANAGER@
 NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT = @NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT@
 NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT = @NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
diff --git a/clients/tui/newt/Makefile.in b/clients/tui/newt/Makefile.in
index f1c579cb..3042089f 100644
--- a/clients/tui/newt/Makefile.in
+++ b/clients/tui/newt/Makefile.in
@@ -330,6 +330,7 @@ NEWT_LIBS = @NEWT_LIBS@
 NM = @NM@
 NMEDIT = @NMEDIT@
 NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT = @NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT@
+NM_CONFIG_DEFAULT_DNS_RC_MANAGER = @NM_CONFIG_DEFAULT_DNS_RC_MANAGER@
 NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT = @NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT@
 NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT = @NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
diff --git a/clients/tui/nmtui-edit.c b/clients/tui/nmtui-edit.c
index c7efd856..96c17245 100644
--- a/clients/tui/nmtui-edit.c
+++ b/clients/tui/nmtui-edit.c
@@ -184,7 +184,12 @@ create_connection (NmtNewtWidget *widget, gpointer list)
 	connection = nm_editor_utils_create_connection (type, priv->master, nm_client);
 	nmt_edit_connection (connection);
 	g_object_unref (connection);
+}
 
+static void
+create_connection_and_quit (NmtNewtWidget *widget, gpointer list)
+{
+	create_connection (widget, list);
 	nmt_newt_form_quit (list);
 }
 
@@ -203,7 +208,7 @@ nmt_add_connection_init (NmtAddConnection *form)
 
 	listbox = nmt_newt_listbox_new (5, NMT_NEWT_LISTBOX_SCROLL);
 	priv->listbox = NMT_NEWT_LISTBOX (listbox);
-	g_signal_connect (priv->listbox, "activated", G_CALLBACK (create_connection), form);
+	g_signal_connect (priv->listbox, "activated", G_CALLBACK (create_connection_and_quit), form);
 	nmt_newt_grid_add (grid, listbox, 0, 1);
 	nmt_newt_widget_set_padding (listbox, 0, 1, 0, 0);
 	nmt_newt_grid_set_flags (grid, listbox, NMT_NEWT_GRID_EXPAND_X);
@@ -223,7 +228,7 @@ nmt_add_connection_init (NmtAddConnection *form)
 	                         NMT_NEWT_GRID_FILL_Y);
 
 	button = g_object_ref_sink (nmt_newt_button_new (_("Create")));
-	g_signal_connect (button, "clicked", G_CALLBACK (create_connection), form);
+	g_signal_connect (button, "clicked", G_CALLBACK (create_connection_and_quit), form);
 	nmt_newt_grid_add (NMT_NEWT_GRID (buttons), button, 1, 0);
 
 	nmt_newt_form_set_content (NMT_NEWT_FORM (form), NMT_NEWT_WIDGET (grid));