From d34f0e7bb001297d6e9771fc7f8533779d7a9345 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Sun, 26 Feb 2017 19:00:31 +0100 Subject: [PATCH] Fix build with new vala https://bugzilla.gnome.org/show_bug.cgi?id=779264 --- src/client/accounts/account-dialog-account-list-pane.vala | 4 ++++ src/client/conversation-list/conversation-list-store.vala | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/src/client/accounts/account-dialog-account-list-pane.vala b/src/client/accounts/account-dialog-account-list-pane.vala index e96b7ad..bc500dc 100644 --- a/src/client/accounts/account-dialog-account-list-pane.vala +++ b/src/client/accounts/account-dialog-account-list-pane.vala @@ -160,7 +160,11 @@ public class AccountDialogAccountListPane : AccountDialogPane { if (iter == null) return; +#if VALA_0_36 + list_model.remove(ref iter); +#else list_model.remove(iter); +#endif } private void on_account_changed(Object object, ParamSpec p) { diff --git a/src/client/conversation-list/conversation-list-store.vala b/src/client/conversation-list/conversation-list-store.vala index 851713d..81e2fdb 100644 --- a/src/client/conversation-list/conversation-list-store.vala +++ b/src/client/conversation-list/conversation-list-store.vala @@ -307,7 +307,11 @@ public class ConversationListStore : Gtk.ListStore { if (last_email == null) { debug("Cannot refresh conversation: last email is null"); +#if VALA_0_36 + remove(ref iter); +#else remove(iter); +#endif return; } @@ -379,7 +383,11 @@ public class ConversationListStore : Gtk.ListStore { private void remove_conversation(Geary.App.Conversation conversation) { Gtk.TreeIter iter; if (get_iter_for_conversation(conversation, out iter)) +#if VALA_0_36 + remove(ref iter); +#else remove(iter); +#endif row_map.remove(conversation); }