From df80569b302161ae9dd696058367d642feafcb12 Mon Sep 17 00:00:00 2001 From: Michael Gratton Date: Thu, 4 Apr 2019 20:50:48 +1100 Subject: [PATCH] Remove some unused code --- src/engine/imap-db/imap-db-folder.vala | 9 --------- src/engine/imap-engine/imap-engine-generic-account.vala | 4 ++-- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/engine/imap-db/imap-db-folder.vala b/src/engine/imap-db/imap-db-folder.vala index 605183a6..f43519df 100644 --- a/src/engine/imap-db/imap-db-folder.vala +++ b/src/engine/imap-db/imap-db-folder.vala @@ -156,7 +156,6 @@ private class Geary.ImapDB.Folder : BaseObject, Geary.ReferenceSemantics { * unless update_uid_info is true. */ public async void update_folder_status(Geary.Imap.FolderProperties remote_properties, - bool update_uid_info, bool respect_marked_for_remove, Cancellable? cancellable) throws Error { @@ -199,9 +198,6 @@ private class Geary.ImapDB.Folder : BaseObject, Geary.ReferenceSemantics { stmt.bind_rowid(2, this.folder_id); stmt.exec(cancellable); - if (update_uid_info) - do_update_uid_info(cx, remote_properties, cancellable); - if (remote_properties.status_messages >= 0) { do_update_last_seen_status_total( cx, remote_properties.status_messages, cancellable @@ -218,11 +214,6 @@ private class Geary.ImapDB.Folder : BaseObject, Geary.ReferenceSemantics { this.properties.recent = remote_properties.recent; this.properties.attrs = remote_properties.attrs; - if (update_uid_info) { - this.properties.uid_validity = remote_properties.uid_validity; - this.properties.uid_next = remote_properties.uid_next; - } - // only update STATUS MESSAGES count if previously set, but use this count as the // "authoritative" value until another SELECT/EXAMINE or MESSAGES response if (remote_properties.status_messages >= 0) { diff --git a/src/engine/imap-engine/imap-engine-generic-account.vala b/src/engine/imap-engine/imap-engine-generic-account.vala index b668f1e5..1c997089 100644 --- a/src/engine/imap-engine/imap-engine-generic-account.vala +++ b/src/engine/imap-engine/imap-engine-generic-account.vala @@ -1255,7 +1255,7 @@ internal class Geary.ImapEngine.UpdateRemoteFolders : AccountOperation { // it's opened try { yield minimal_folder.local_folder.update_folder_status( - remote_folder.properties, false, false, cancellable + remote_folder.properties, false, cancellable ); } catch (Error update_error) { debug("Unable to update local folder %s with remote properties: %s", @@ -1391,7 +1391,7 @@ internal class Geary.ImapEngine.RefreshFolderUnseen : FolderOperation { this.folder.to_string())) { yield local_folder.update_folder_status( - remote_folder.properties, false, true, cancellable + remote_folder.properties, true, cancellable ); ((GenericAccount) this.account).update_folder(this.folder);