Get rid of manual storage objects for delegates

1 files changed, 6 insertions, 8 deletions

diff --git a/main/src/ui/add_conversation/conference/conference_list.vala b/main/src/ui/add_conversation/conference/conference_list.vala
index ac74fa3a..1f4abfa3 100644
--- a/main/src/ui/add_conversation/conference/conference_list.vala
+++ b/main/src/ui/add_conversation/conference/conference_list.vala
@@ -29,7 +29,7 @@ protected class ConferenceList : FilterableList {
         });
 
         foreach (Account account in stream_interactor.get_accounts()) {
-            stream_interactor.get_module(MucManager.IDENTITY).get_bookmarks(account, on_conference_bookmarks_received, Tuple.create(this, account));
+            stream_interactor.get_module(MucManager.IDENTITY).get_bookmarks(account, (stream, conferences) => { on_conference_bookmarks_received(stream, account, conferences); });
         }
     }
 
@@ -42,13 +42,11 @@ protected class ConferenceList : FilterableList {
         }
     }
 
-    private static void on_conference_bookmarks_received(Core.XmppStream stream, Gee.List<Xep.Bookmarks.Conference> conferences, Object? o) {
+    private void on_conference_bookmarks_received(Core.XmppStream stream, Account account, Gee.List<Xep.Bookmarks.Conference> conferences) {
         Idle.add(() => {
-            Tuple<ConferenceList, Account> tuple = o as Tuple<ConferenceList, Account>;
-            ConferenceList list = tuple.a;
-            Account account = tuple.b;
-            list.lists[account] = conferences;
-            list.refresh_conferences(); return false;
+            lists[account] = conferences;
+            refresh_conferences();
+            return false;
         });
     }
 
@@ -102,4 +100,4 @@ internal class ConferenceListRow : ListRow {
     }
 }
 
-}
\ No newline at end of file
+}