From 0626bad8e9c2f7dfd4d8eccc86ec1e8bec6c7308 Mon Sep 17 00:00:00 2001 From: fiaxh Date: Wed, 10 Feb 2021 18:32:39 -0600 Subject: Reduce use of Widget.destroy() On non-toplevel windows, use Container.remove() instead of Widget.destroy() Needed for migration to GTK4 https://developer.gnome.org/gtk4/unstable/gtk-migrating-3-to-4.html#id-1.7.4.3.17 --- main/src/ui/manage_accounts/add_account_dialog.vala | 2 +- main/src/ui/manage_accounts/dialog.vala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'main/src/ui/manage_accounts') diff --git a/main/src/ui/manage_accounts/add_account_dialog.vala b/main/src/ui/manage_accounts/add_account_dialog.vala index 57c624ad..339b880f 100644 --- a/main/src/ui/manage_accounts/add_account_dialog.vala +++ b/main/src/ui/manage_accounts/add_account_dialog.vala @@ -329,7 +329,7 @@ public class AddAccountDialog : Gtk.Dialog { } private void set_register_form(Jid server, Xep.InBandRegistration.Form form) { - form_box.foreach((widget) => { widget.destroy(); }); + form_box.foreach((widget) => { form_box.remove(widget); }); register_title.label = _("Register on %s").printf(server.to_string()); if (form.oob != null) { diff --git a/main/src/ui/manage_accounts/dialog.vala b/main/src/ui/manage_accounts/dialog.vala index 568b7ff4..f7af5159 100644 --- a/main/src/ui/manage_accounts/dialog.vala +++ b/main/src/ui/manage_accounts/dialog.vala @@ -128,7 +128,7 @@ public class Dialog : Gtk.Dialog { ok_button.label = _("Remove"); ok_button.get_style_context().add_class("destructive-action"); if (msg.run() == Gtk.ResponseType.OK) { - account_item.destroy(); + account_list.remove(account_item); if (account_item.account.enabled) account_disabled(account_item.account); account_item.account.remove(); if (account_list.get_row_at_index(0) != null) { -- cgit v1.2.3-54-g00ecf