[geary/wip/only-incomplete: 5/5] Further database improvements

[Jim Nelson <jnelson src gnome org>]

commit d713221811de70145e048a48a7675e20d262274e
Author: Jim Nelson <jim yorba org>
Date:   Wed May 21 13:17:19 2014 -0700

    Further database improvements

 src/engine/db/db-transaction-type.vala |    4 ++--
 src/engine/imap-db/imap-db-folder.vala |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/src/engine/db/db-transaction-type.vala b/src/engine/db/db-transaction-type.vala
index bc367eb..2aee779 100644
--- a/src/engine/db/db-transaction-type.vala
+++ b/src/engine/db/db-transaction-type.vala
@@ -10,8 +10,8 @@ public enum Geary.Db.TransactionType {
     EXCLUSIVE,
     
     // coarse synonyms
-    RO = DEFERRED,
-    RW = DEFERRED,
+    RO = IMMEDIATE,
+    RW = EXCLUSIVE,
     WR = EXCLUSIVE,
     WO = EXCLUSIVE;
     
diff --git a/src/engine/imap-db/imap-db-folder.vala b/src/engine/imap-db/imap-db-folder.vala
index 813aeef..e2e5d52 100644
--- a/src/engine/imap-db/imap-db-folder.vala
+++ b/src/engine/imap-db/imap-db-folder.vala
@@ -21,7 +21,7 @@ private class Geary.ImapDB.Folder : BaseObject, Geary.ReferenceSemantics {
     private const int LIST_EMAIL_WITH_MESSAGE_CHUNK_COUNT = 10;
     private const int LIST_EMAIL_METADATA_COUNT = 100;
     private const int LIST_EMAIL_FIELDS_CHUNK_COUNT = 500;
-    private const int CREATE_MERGE_EMAIL_CHUNK_COUNT = 100;
+    private const int CREATE_MERGE_EMAIL_CHUNK_COUNT = 25;
     
     [Flags]
     public enum ListFlags {