[geary: 14/14] Merge branch 'wip/726281-text-attachment-crlf'. Fixes Bug 726281.

[Michael Gratton <mjog src gnome org>]

commit 440a4d593273ff9237c0d603d2ebd60d7e71bbf7
Merge: 386f986 fe9461e
Author: Michael James Gratton <mike vee net>
Date:   Sat May 19 14:59:10 2018 +1000

    Merge branch 'wip/726281-text-attachment-crlf'. Fixes Bug 726281.

 po/POTFILES.in                                     |    2 +-
 src/CMakeLists.txt                                 |    2 +-
 .../conversation-viewer/conversation-email.vala    |    2 +-
 .../conversation-viewer/conversation-message.vala  |   35 +-
 src/engine/api/geary-attachment.vala               |   42 +-
 src/engine/api/geary-email.vala                    |   19 -
 src/engine/db/db-connection.vala                   |   78 +++-
 src/engine/db/db-database.vala                     |  253 +++++++----
 src/engine/db/db-transaction-async-job.vala        |   36 +-
 src/engine/db/db-versioned-database.vala           |  313 ++++++++------
 src/engine/db/db.vala                              |    7 +-
 src/engine/imap-db/imap-db-account.vala            |  104 +++--
 src/engine/imap-db/imap-db-attachment.vala         |  309 ++++++++++++--
 src/engine/imap-db/imap-db-database.vala           |  474 ++++++++++----------
 src/engine/imap-db/imap-db-folder.vala             |  252 ++---------
 src/engine/imap-db/imap-db-gc.vala                 |   53 +--
 src/engine/imap/api/imap-folder-session.vala       |    4 +-
 src/engine/meson.build                             |    2 +-
 src/engine/mime/mime-content-parameters.vala       |   46 +--
 src/engine/mime/mime-content-type.vala             |   41 ++-
 src/engine/rfc822/rfc822-message-data.vala         |   65 ++--
 src/engine/rfc822/rfc822-message.vala              |  313 +++++---------
 src/engine/rfc822/rfc822-part.vala                 |  195 ++++++++
 src/engine/rfc822/rfc822-utils.vala                |   14 -
 src/engine/util/util-converter.vala                |   77 ----
 src/engine/util/util-stream.vala                   |  191 +++++++--
 test/CMakeLists.txt                                |    5 +
 test/data/basic-multipart-alternative.eml          |   36 ++
 test/data/basic-text-html.eml                      |   18 +
 test/data/basic-text-plain.eml                     |   17 +
 test/data/geary-0.6-db.tar.xz                      |  Bin 0 -> 1128764 bytes
 test/data/meson.build                              |    3 +
 test/data/org.gnome.GearyTest.gresource.xml        |    9 +
 test/engine/api/geary-attachment-test.vala         |   53 +--
 test/engine/db/db-database-test.vala               |  125 +++++
 test/engine/db/db-versioned-database-test.vala     |   54 +++
 test/engine/imap-db/imap-db-attachment-test.vala   |  364 +++++++++++++++
 test/engine/imap-db/imap-db-database-test.vala     |  158 +++++++
 test/engine/mime-content-type-test.vala            |   53 ++-
 test/engine/rfc822-message-data-test.vala          |   24 +-
 test/engine/rfc822-message-test.vala               |  189 ++++++--
 test/engine/rfc822-part-test.vala                  |   71 +++
 test/meson.build                                   |   11 +-
 test/test-case.vala                                |   17 +
 test/test-engine.vala                              |    5 +
 45 files changed, 2722 insertions(+), 1419 deletions(-)
---
diff --cc src/engine/mime/mime-content-parameters.vala
index 71e579e,642eed8..90d578e
--- a/src/engine/mime/mime-content-parameters.vala
+++ b/src/engine/mime/mime-content-parameters.vala
@@@ -86,29 -101,8 +101,8 @@@ public class Geary.Mime.ContentParamete
       */
      public bool has_value_cs(string attribute, string value) {
          string? stored = params.get(attribute);
 -
 -        return (stored != null) ? (stored == value) : false;
 +        
 +        return (stored != null) ? Ascii.str_equal(stored, value) : false;
      }
-     
-     /**
-      * Add or replace the parameter.
-      *
-      * Returns true if the parameter was added, false, otherwise.
-      */
-     public bool set_parameter(string attribute, string value) {
-         bool added = !params.has_key(attribute);
-         params.set(attribute, value);
-         
-         return added;
-     }
-     
-     /**
-      * Removes the parameter.
-      *
-      * Returns true if the parameter was present.
-      */
-     public bool remove_parameter(string attribute) {
-         return params.unset(attribute);
-     }
- }
  
+ }
diff --cc test/CMakeLists.txt
index 381c87c,fc276ce..2135c7f
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@@ -35,8 -39,8 +39,9 @@@ set(TEST_ENGINE_SR
    engine/rfc822-mailbox-addresses-test.vala
    engine/rfc822-message-test.vala
    engine/rfc822-message-data-test.vala
+   engine/rfc822-part-test.vala
    engine/rfc822-utils-test.vala
 +  engine/util-ascii-test.vala
    engine/util-html-test.vala
    engine/util-idle-manager-test.vala
    engine/util-inet-test.vala
diff --cc test/meson.build
index e74841c,108f048..98f7837
--- a/test/meson.build
+++ b/test/meson.build
@@@ -31,8 -37,8 +37,9 @@@ geary_test_engine_sources = 
    'engine/rfc822-mailbox-addresses-test.vala',
    'engine/rfc822-message-test.vala',
    'engine/rfc822-message-data-test.vala',
+   'engine/rfc822-part-test.vala',
    'engine/rfc822-utils-test.vala',
 +  'engine/util-ascii-test.vala',
    'engine/util-html-test.vala',
    'engine/util-idle-manager-test.vala',
    'engine/util-inet-test.vala',
diff --cc test/test-engine.vala
index 06349ae,a6d60f1..82e1664
--- a/test/test-engine.vala
+++ b/test/test-engine.vala
@@@ -30,7 -30,8 +30,9 @@@ int main(string[] args) 
      engine.add_suite(new Geary.App.ConversationSetTest().get_suite());
      // Depends on ConversationTest and ConversationSetTest passing
      engine.add_suite(new Geary.App.ConversationMonitorTest().get_suite());
 +    engine.add_suite(new Geary.Ascii.Test().get_suite());
+     engine.add_suite(new Geary.Db.DatabaseTest().get_suite());
+     engine.add_suite(new Geary.Db.VersionedDatabaseTest().get_suite());
      engine.add_suite(new Geary.HTML.UtilTest().get_suite());
      engine.add_suite(new Geary.Imap.DeserializerTest().get_suite());
      engine.add_suite(new Geary.Imap.CreateCommandTest().get_suite());