[geary/geary-0.13] Fix incorrect string format causing crashes on 32-bit systems

[Michael Gratton <mjog src gnome org>]

commit 026e62014ae7367713e0761cde7891f143c4d5b7
Author: Michael Gratton <mike vee net>
Date:   Thu Feb 21 10:33:56 2019 +1100

    Fix incorrect string format causing crashes on 32-bit systems
    
    Fixes #252

 src/engine/imap-engine/replay-ops/imap-engine-replay-removal.vala | 6 +++---
 src/engine/util/util-stream.vala                                  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/engine/imap-engine/replay-ops/imap-engine-replay-removal.vala 
b/src/engine/imap-engine/replay-ops/imap-engine-replay-removal.vala
index d42388e4..fba48c27 100644
--- a/src/engine/imap-engine/replay-ops/imap-engine-replay-removal.vala
+++ b/src/engine/imap-engine/replay-ops/imap-engine-replay-removal.vala
@@ -107,8 +107,8 @@ private class Geary.ImapEngine.ReplayRemoval : Geary.ImapEngine.ReplayOperation
             this.owner.replay_queue.notify_remote_removed_ids(
                 Geary.iterate<ImapDB.EmailIdentifier>(owned_id).to_array_list());
         } else {
-            debug("%s do_replay_removed_message: this.position=%ld unknown in local store "
-                + "(this.remote_count=%d local_position=%ld local_count=%d)",
+            debug("%s do_replay_removed_message: this.position=%lld unknown in local store "
+                + "(this.remote_count=%d local_position=%lld local_count=%d)",
                 to_string(), this.position.value, this.remote_count, local_position, local_count);
         }
 
@@ -148,7 +148,7 @@ private class Geary.ImapEngine.ReplayRemoval : Geary.ImapEngine.ReplayOperation
         }
 
         debug("%s ReplayRemoval: completed, "
-            + "(this.remote_count=%d local_count=%d starting local_count=%d this.position=%ld 
local_position=%ld marked=%s)",
+            + "(this.remote_count=%d local_count=%d starting local_count=%d this.position=%lld 
local_position=%lld marked=%s)",
               this.owner.to_string(),
               this.remote_count, new_local_count, local_count,
               this.position.value, local_position, marked.to_string());
diff --git a/src/engine/util/util-stream.vala b/src/engine/util/util-stream.vala
index dc3e6b83..4ce86e69 100644
--- a/src/engine/util/util-stream.vala
+++ b/src/engine/util/util-stream.vala
@@ -81,7 +81,7 @@ namespace Geary.Stream {
                     double pct = (converted_bytes_read > converted_bytes_written)
                     ? (double) converted_bytes_written / (double) converted_bytes_read
                     : (double) converted_bytes_read / (double) converted_bytes_written;
-                    debug("%s read/written: %s/%s (%ld%%)", name, converted_bytes_read.to_string(),
+                    debug("%s read/written: %s/%s (%lld%%)", name, converted_bytes_read.to_string(),
                           converted_bytes_written.to_string(), (long) (pct * 100.0));
                 }