applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

network-connection-editor: Close the editor when nm-connection-editor exits

Browse source 
Previously, when editing a connection that doesn't have native editor
support, nm-connection-editor is spawned to do the work. But after
closing nm-connection-editor, an empty editor dialog still exists.

Fix that in this commit.
This commit is contained in:
Jonathan Kang 2023-10-09 09:14:03 +08:00 • committed by Felipe Borges
parent 1c9c6805a5
commit f0d04a180f
1 changed files with 35 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
panels/network/connection-editor/net-connection-editor.c
View file

@ -363,19 +363,47 @@ net_connection_editor_class_init (NetConnectionEditorClass *class)
} }
static void static void
net_connection_editor_do_fallback (NetConnectionEditor *self, const gchar *type) nm_connection_editor_watch_cb (GPid pid,
gint status,
gpointer user_data)
{ {
g_autofree gchar *cmdline = NULL; g_debug ("Child %d" G_PID_FORMAT " exited %s", pid,
g_autoptr(GError) error = NULL; g_spawn_check_wait_status (status, NULL) ? "normally" : "abnormally");
if (self->is_new_connection) { g_spawn_close_pid (pid);
cmdline = g_strdup_printf ("nm-connection-editor --type='%s' --create", type); /* Close the dialog when nm-connection-editor exits. */
} else { gtk_window_destroy (GTK_WINDOW (user_data));
cmdline = g_strdup_printf ("nm-connection-editor --edit='%s'",
nm_connection_get_uuid (self->connection));
} }
g_spawn_command_line_async (cmdline, &error); static void
net_connection_editor_do_fallback (NetConnectionEditor *self, const gchar *type)
{
g_autoptr(GError) error = NULL;
g_autoptr(GStrvBuilder) builder = NULL;
g_auto(GStrv) argv = NULL;
GPid child_pid;
builder = g_strv_builder_new ();
g_strv_builder_add (builder, "nm-connection-editor");
if (self->is_new_connection) {
g_autofree gchar *type_str = NULL;
type_str = g_strdup_printf ("--type=%s", type);
g_strv_builder_add (builder, type_str);
g_strv_builder_add (builder, "--create");
} else {
g_autofree gchar *edit_str = NULL;
edit_str = g_strdup_printf ("--edit=%s", nm_connection_get_uuid (self->connection));
g_strv_builder_add (builder, edit_str);
}
g_strv_builder_add (builder, NULL);
argv = g_strv_builder_end (builder);
g_spawn_async_with_pipes (NULL, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_SEARCH_PATH,
NULL, NULL, &child_pid, NULL, NULL, NULL, &error);
if (error) { if (error) {
AdwToast *toast; AdwToast *toast;
@ -385,6 +413,8 @@ net_connection_editor_do_fallback (NetConnectionEditor *self, const gchar *type)
toast = adw_toast_new (message); toast = adw_toast_new (message);
adw_toast_overlay_add_toast (self->toast_overlay, toast); adw_toast_overlay_add_toast (self->toast_overlay, toast);
} else {
g_child_watch_add (child_pid, nm_connection_editor_watch_cb, self);
} }
g_signal_emit (self, signals[DONE], 0, FALSE); g_signal_emit (self, signals[DONE], 0, FALSE);