ood-ports-lbsd-fork1/mail/geary/patches/patch-src_engine_imap-db_imap-db-folder_vala

$OpenBSD: patch-src_engine_imap-db_imap-db-folder_vala,v 1.1 2017/04/13 07:10:21 jasper Exp $

From 5a0b85e58639f5a9b9e2a1aa6b1882da6b2e6648 Mon Sep 17 00:00:00 2001
From: Michael James Gratton <mike@vee.net>
Date: Tue, 4 Oct 2016 00:06:54 +1100
Subject: Fix compilation with valac git master.

--- src/engine/imap-db/imap-db-folder.vala.orig	Sun Dec 25 02:14:36 2016
+++ src/engine/imap-db/imap-db-folder.vala	Thu Apr 13 08:45:54 2017
@@ -869,10 +869,10 @@ private class Geary.ImapDB.Folder : BaseObject, Geary.
         if (unread_status.size > 0)
             unread_updated(unread_status);
     }
-    
-    public async Gee.Map<ImapDB.EmailIdentifier, Geary.EmailFlags>? get_email_flags_async(
-        Gee.Collection<ImapDB.EmailIdentifier> ids, Cancellable? cancellable) throws Error {
-        Gee.Map<ImapDB.EmailIdentifier, Geary.EmailFlags>? map = null;
+
+    internal async Gee.Map<ImapDB.EmailIdentifier, Geary.EmailFlags>? get_email_flags_async(
+        Gee.Collection<EmailIdentifier> ids, Cancellable? cancellable) throws Error {
+        Gee.Map<EmailIdentifier, Geary.EmailFlags>? map = null;
         yield db.exec_transaction_async(Db.TransactionType.RO, (cx, cancellable) => {
             map = do_get_email_flags(cx, ids, cancellable);
             
@@ -1084,11 +1084,11 @@ private class Geary.ImapDB.Folder : BaseObject, Geary.
         if (ids.size == 0)
             return null;
         
-        Gee.HashMap<Geary.EmailIdentifier, Geary.Email.Field> map = new Gee.HashMap<
-            Geary.EmailIdentifier, Geary.Email.Field>();
+        Gee.HashMap<ImapDB.EmailIdentifier,Geary.Email.Field> map = new Gee.HashMap<
+            ImapDB.EmailIdentifier,Geary.Email.Field>();
         
         // Break up the work
-        Gee.List<ImapDB.EmailIdentifier> list = new Gee.ArrayList<Geary.EmailIdentifier>();
+        Gee.List<ImapDB.EmailIdentifier> list = new Gee.ArrayList<ImapDB.EmailIdentifier>();
         Gee.Iterator<ImapDB.EmailIdentifier> iter = ids.iterator();
         while (iter.next()) {
             list.add(iter.get());
@@ -1575,7 +1575,7 @@ private class Geary.ImapDB.Folder : BaseObject, Geary.
         Db.Statement fetch_stmt = cx.prepare("SELECT flags FROM MessageTable WHERE id=?");
         
         Gee.Map<ImapDB.EmailIdentifier, Geary.EmailFlags> map = new Gee.HashMap<
-            Geary.EmailIdentifier, Geary.EmailFlags>();
+            ImapDB.EmailIdentifier, Geary.EmailFlags>();
         // TODO: Unroll this loop
         foreach (LocationIdentifier location in locs) {
             fetch_stmt.reset(Db.ResetScope.CLEAR_BINDINGS);