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/add_conversation/conference_list.vala | 2 +- main/src/ui/add_conversation/select_jid_fragment.vala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'main/src/ui/add_conversation') diff --git a/main/src/ui/add_conversation/conference_list.vala b/main/src/ui/add_conversation/conference_list.vala index f18a89d5..fa71f98f 100644 --- a/main/src/ui/add_conversation/conference_list.vala +++ b/main/src/ui/add_conversation/conference_list.vala @@ -49,7 +49,7 @@ protected class ConferenceList : FilterableList { private void remove_conference(Account account, Jid jid) { if (widgets.has_key(account) && widgets[account].has_key(jid)) { - widgets[account][jid].destroy(); + remove(widgets[account][jid]); widgets[account].unset(jid); } } diff --git a/main/src/ui/add_conversation/select_jid_fragment.vala b/main/src/ui/add_conversation/select_jid_fragment.vala index f0170cfb..2035b14b 100644 --- a/main/src/ui/add_conversation/select_jid_fragment.vala +++ b/main/src/ui/add_conversation/select_jid_fragment.vala @@ -48,7 +48,7 @@ public class SelectJidFragment : Gtk.Box { public void set_filter(string str) { if (entry.text != str) entry.text = str; - foreach (AddListRow row in added_rows) row.destroy(); + foreach (AddListRow row in added_rows) filterable_list.remove(row); added_rows.clear(); string[] ? values = str == "" ? null : str.split(" "); -- cgit v1.2.3-54-g00ecf