[geary/geary-0.11] Fix build with new vala



commit d79d03f4b2532641f4a49425c77ad9e7698944c7
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Sun Feb 26 19:00:31 2017 +0100

    Fix build with new vala
    
    https://bugzilla.gnome.org/show_bug.cgi?id=779264

 .../accounts/account-dialog-account-list-pane.vala |    4 ++++
 .../conversation-list/conversation-list-store.vala |    8 ++++++++
 2 files changed, 12 insertions(+), 0 deletions(-)
---
diff --git a/src/client/accounts/account-dialog-account-list-pane.vala 
b/src/client/accounts/account-dialog-account-list-pane.vala
index e82c379..92103bf 100644
--- a/src/client/accounts/account-dialog-account-list-pane.vala
+++ b/src/client/accounts/account-dialog-account-list-pane.vala
@@ -158,7 +158,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 7e3d8c2..446cc21 100644
--- a/src/client/conversation-list/conversation-list-store.vala
+++ b/src/client/conversation-list/conversation-list-store.vala
@@ -313,7 +313,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;
         }
         
@@ -385,7 +389,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);
     }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]