[geary/mjog/rfc822-cleanup: 12/21] Geary.Imap.RFC822Size: Decouple from RFC822.Size

[Michael Gratton <mjog src gnome org>]

commit 94c61e91430b77dbc0b0a23bb8d4210caac8f49e
Author: Michael Gratton <mike vee net>
Date:   Wed May 6 11:20:57 2020 +1000

    Geary.Imap.RFC822Size: Decouple from RFC822.Size
    
    Derive directly from Int64MessageData instead and remove RFC822.Size
    since the latter is not actually used or specified in RFC 822 and its
    obsoletors.

 src/engine/imap-db/imap-db-message-row.vala    | 4 +++-
 src/engine/imap/api/imap-email-properties.vala | 8 +++++---
 src/engine/imap/api/imap-folder-session.vala   | 4 ++--
 src/engine/imap/message/imap-message-data.vala | 2 +-
 src/engine/rfc822/rfc822-message-data.vala     | 5 -----
 5 files changed, 11 insertions(+), 12 deletions(-)
---
diff --git a/src/engine/imap-db/imap-db-message-row.vala b/src/engine/imap-db/imap-db-message-row.vala
index 4744a9572..f7b065dc6 100644
--- a/src/engine/imap-db/imap-db-message-row.vala
+++ b/src/engine/imap-db/imap-db-message-row.vala
@@ -171,7 +171,9 @@ private class Geary.ImapDB.MessageRow {
             return null;
         }
 
-        return new Geary.Imap.EmailProperties(constructed, new RFC822.Size(rfc822_size));
+        return new Imap.EmailProperties(
+            constructed, new Imap.RFC822Size(this.rfc822_size)
+        );
     }
 
     public Geary.EmailFlags? get_generic_email_flags() {
diff --git a/src/engine/imap/api/imap-email-properties.vala b/src/engine/imap/api/imap-email-properties.vala
index 6ef848525..88fb95f5e 100644
--- a/src/engine/imap/api/imap-email-properties.vala
+++ b/src/engine/imap/api/imap-email-properties.vala
@@ -5,12 +5,14 @@
  */
 
 public class Geary.Imap.EmailProperties : Geary.EmailProperties, Gee.Hashable<Geary.Imap.EmailProperties> {
+
+
     public InternalDate? internaldate { get; private set; }
-    public RFC822.Size? rfc822_size { get; private set; }
+    public RFC822Size? rfc822_size { get; private set; }
 
-    public EmailProperties(InternalDate? internaldate, RFC822.Size? rfc822_size) {
+    public EmailProperties(InternalDate internaldate,
+                           RFC822Size rfc822_size) {
         base (internaldate.value, rfc822_size.value);
-
         this.internaldate = internaldate;
         this.rfc822_size = rfc822_size;
     }
diff --git a/src/engine/imap/api/imap-folder-session.vala b/src/engine/imap/api/imap-folder-session.vala
index c94da4bc2..a934fecc5 100644
--- a/src/engine/imap/api/imap-folder-session.vala
+++ b/src/engine/imap/api/imap-folder-session.vala
@@ -808,7 +808,7 @@ private class Geary.Imap.FolderSession : Geary.Imap.SessionObject {
 
         // accumulate these to submit Imap.EmailProperties all at once
         InternalDate? internaldate = null;
-        RFC822.Size? rfc822_size = null;
+        RFC822Size? rfc822_size = null;
 
         // accumulate these to submit References all at once
         RFC822.MessageID? message_id = null;
@@ -848,7 +848,7 @@ private class Geary.Imap.FolderSession : Geary.Imap.SessionObject {
                 break;
 
                 case FetchDataSpecifier.RFC822_SIZE:
-                    rfc822_size = (RFC822.Size) data;
+                    rfc822_size = (RFC822Size) data;
                 break;
 
                 case FetchDataSpecifier.FLAGS:
diff --git a/src/engine/imap/message/imap-message-data.vala b/src/engine/imap/message/imap-message-data.vala
index 07c10f3cd..b61a89446 100644
--- a/src/engine/imap/message/imap-message-data.vala
+++ b/src/engine/imap/message/imap-message-data.vala
@@ -19,7 +19,7 @@
 public interface Geary.Imap.MessageData : Geary.MessageData.AbstractMessageData {
 }
 
-public class Geary.Imap.RFC822Size : Geary.RFC822.Size, Geary.Imap.MessageData {
+public class Geary.Imap.RFC822Size : Geary.MessageData.Int64MessageData, Geary.Imap.MessageData {
     public RFC822Size(int64 value) {
         base (value);
     }
diff --git a/src/engine/rfc822/rfc822-message-data.vala b/src/engine/rfc822/rfc822-message-data.vala
index e7f5df124..14523cfc7 100644
--- a/src/engine/rfc822/rfc822-message-data.vala
+++ b/src/engine/rfc822/rfc822-message-data.vala
@@ -213,12 +213,7 @@ public class Geary.RFC822.Date : Geary.RFC822.MessageData, Geary.MessageData.Abs
     public override string to_string() {
         return original ?? value.to_string();
     }
-}
 
-public class Geary.RFC822.Size : Geary.MessageData.Int64MessageData, Geary.RFC822.MessageData {
-    public Size(int64 value) {
-        base (value);
-    }
 }
 
 public class Geary.RFC822.Subject : Geary.MessageData.StringMessageData,