From e5d65222c5bf92ef91f1072a64f027e9887fefc1 Mon Sep 17 00:00:00 2001 From: Michael James Gratton Date: Sun, 19 Jun 2016 22:05:58 +1000 Subject: [PATCH] Set correct length modifiers for some format strings with 64-bit values. This fixes regular crashes from incorrect lengths on i686 arches - see Vala Bug 767839. Fixes Geary Bug 758621 * src/engine/imap-engine/imap-engine-minimal-folder.vala: Use "%lld" when printing int64 values. --- src/engine/imap-engine/imap-engine-minimal-folder.vala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/engine/imap-engine/imap-engine-minimal-folder.vala b/src/engine/imap-engine/imap-engine-minimal-folder.vala index 8d8ba833..b4279d09 100644 --- a/src/engine/imap-engine/imap-engine-minimal-folder.vala +++ b/src/engine/imap-engine/imap-engine-minimal-folder.vala @@ -1233,7 +1233,7 @@ private class Geary.ImapEngine.MinimalFolder : Geary.Folder, Geary.FolderSupport Geary.iterate(owned_id).to_array_list()); } else { debug("%s do_replay_removed_message: remote_position=%d unknown in local store " - + "(reported_remote_count=%d local_position=%d local_count=%d)", + + "(reported_remote_count=%d local_position=%lld local_count=%d)", to_string(), remote_position.value, reported_remote_count, local_position, local_count); } @@ -1270,7 +1270,7 @@ private class Geary.ImapEngine.MinimalFolder : Geary.Folder, Geary.FolderSupport notify_email_count_changed(reported_remote_count, CountChangeReason.REMOVED); debug("%s do_replay_remove_message: completed, current remote_count=%d " - + "(reported_remote_count=%d local_count=%d starting local_count=%d remote_position=%d local_position=%d marked=%s)", + + "(reported_remote_count=%d local_count=%d starting local_count=%d remote_position=%lld local_position=%lld marked=%s)", to_string(), remote_count, reported_remote_count, new_local_count, local_count, remote_position.value, local_position, marked.to_string()); }