Attachment 186031 Details for Bug 222026 – patch

[patch] patch

geary.diff (text/plain), 18.85 KB, created by Carlos J. Puga Medina on 2017-09-03 14:19:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos J. Puga Medina

Created: 2017-09-03 14:19:18 UTC

Size: 18.85 KB

patch

obsolete

>Index: mail/geary/files/patch-src_client_accounts_account-dialog-account-list-pane.vala
>===================================================================
>--- mail/geary/files/patch-src_client_accounts_account-dialog-account-list-pane.vala	(nonexistent)
>+++ mail/geary/files/patch-src_client_accounts_account-dialog-account-list-pane.vala	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/client/accounts/account-dialog-account-list-pane.vala.orig	2015-03-30 21:47:50 UTC
>++++ src/client/accounts/account-dialog-account-list-pane.vala
>+@@ -158,7 +158,7 @@ public class AccountDialogAccountListPane : AccountDia
>+         if (iter == null)
>+             return;
>+         
>+-        list_model.remove(iter);
>++        list_model.remove(ref iter);
>+     }
>+     
>+     private void on_account_changed(Object object, ParamSpec p) {
>
>Property changes on: mail/geary/files/patch-src_client_accounts_account-dialog-account-list-pane.vala
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: mail/geary/files/patch-src_client_components_conversation-find-bar.vala
>===================================================================
>--- mail/geary/files/patch-src_client_components_conversation-find-bar.vala	(nonexistent)
>+++ mail/geary/files/patch-src_client_components_conversation-find-bar.vala	(working copy)
>@@ -0,0 +1,14 @@
>+--- src/client/components/conversation-find-bar.vala.orig	2015-03-30 21:47:50 UTC
>++++ src/client/components/conversation-find-bar.vala
>+@@ -211,9 +211,9 @@ public class ConversationFindBar : Gtk.Layout {
>+         
>+         if (matches > 0) {
>+             if (!wrapped)
>+-                content += ngettext("%i match", "%i matches", matches).printf(matches);
>++                content += ngettext("%i match", "%i matches", matches).printf((int) matches);
>+             else
>+-                content += ngettext("%i match (wrapped)", "%i matches (wrapped)", matches).printf(matches);
>++                content += ngettext("%i match (wrapped)", "%i matches (wrapped)", matches).printf((int) matches);
>+         } else {
>+             content += _("not found");
>+         }
>
>Property changes on: mail/geary/files/patch-src_client_components_conversation-find-bar.vala
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: mail/geary/files/patch-src_client_conversation-list_conversation-list-store.vala
>===================================================================
>--- mail/geary/files/patch-src_client_conversation-list_conversation-list-store.vala	(nonexistent)
>+++ mail/geary/files/patch-src_client_conversation-list_conversation-list-store.vala	(working copy)
>@@ -0,0 +1,20 @@
>+--- src/client/conversation-list/conversation-list-store.vala.orig	2015-03-30 21:47:50 UTC
>++++ src/client/conversation-list/conversation-list-store.vala
>+@@ -313,7 +313,7 @@ public class ConversationListStore : Gtk.ListStore {
>+         if (last_email == null) {
>+             debug("Cannot refresh conversation: last email is null");
>+             
>+-            remove(iter);
>++            remove(ref iter);
>+             return;
>+         }
>+         
>+@@ -385,7 +385,7 @@ public class ConversationListStore : Gtk.ListStore {
>+     private void remove_conversation(Geary.App.Conversation conversation) {
>+         Gtk.TreeIter iter;
>+         if (get_iter_for_conversation(conversation, out iter))
>+-            remove(iter);
>++            remove(ref iter);
>+         
>+         row_map.remove(conversation);
>+     }
>
>Property changes on: mail/geary/files/patch-src_client_conversation-list_conversation-list-store.vala
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: mail/geary/files/patch-src_client_util_util-date.vala
>===================================================================
>--- mail/geary/files/patch-src_client_util_util-date.vala	(nonexistent)
>+++ mail/geary/files/patch-src_client_util_util-date.vala	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/client/util/util-date.vala.orig	2015-03-30 21:47:50 UTC
>++++ src/client/util/util-date.vala
>+@@ -164,7 +164,7 @@ private string pretty_print_coarse(CoarseDate coarse_d
>+             return _("Now");
>+         
>+         case CoarseDate.MINUTES:
>+-            return ngettext("%dm ago", "%dm ago", (ulong) (diff / TimeSpan.MINUTE)).printf(diff / TimeSpan.MINUTE);
>++            return ngettext("%dm ago", "%dm ago", (ulong) (diff / TimeSpan.MINUTE)).printf((int) (diff / TimeSpan.MINUTE));
>+         
>+         case CoarseDate.HOURS:
>+             int rounded = (int) Math.round((double) diff / TimeSpan.HOUR);
>
>Property changes on: mail/geary/files/patch-src_client_util_util-date.vala
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: mail/geary/files/patch-src_engine_db_db-transaction-async-job.vala
>===================================================================
>--- mail/geary/files/patch-src_engine_db_db-transaction-async-job.vala	(nonexistent)
>+++ mail/geary/files/patch-src_engine_db_db-transaction-async-job.vala	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/engine/db/db-transaction-async-job.vala.orig	2015-03-30 21:47:50 UTC
>++++ src/engine/db/db-transaction-async-job.vala
>+@@ -12,7 +12,7 @@ private class Geary.Db.TransactionAsyncJob : BaseObjec
>+     private TransactionOutcome outcome = TransactionOutcome.ROLLBACK;
>+     private Error? caught_err = null;
>+     
>+-    protected TransactionAsyncJob(TransactionType type, TransactionMethod cb, Cancellable? cancellable) {
>++    public TransactionAsyncJob(TransactionType type, TransactionMethod cb, Cancellable? cancellable) {
>+         this.type = type;
>+         this.cb = cb;
>+         this.cancellable = cancellable ?? new Cancellable();
>
>Property changes on: mail/geary/files/patch-src_engine_db_db-transaction-async-job.vala
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: mail/geary/files/patch-src_engine_imap-db_imap-db-attachment.vala
>===================================================================
>--- mail/geary/files/patch-src_engine_imap-db_imap-db-attachment.vala	(nonexistent)
>+++ mail/geary/files/patch-src_engine_imap-db_imap-db-attachment.vala	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/engine/imap-db/imap-db-attachment.vala.orig	2015-03-30 21:47:50 UTC
>++++ src/engine/imap-db/imap-db-attachment.vala
>+@@ -9,7 +9,7 @@ private class Geary.ImapDB.Attachment : Geary.Attachme
>+     
>+     private const string ATTACHMENTS_DIR = "attachments";
>+     
>+-    protected Attachment(File data_dir, string? filename, Mime.ContentType content_type, int64 filesize,
>++    public Attachment(File data_dir, string? filename, Mime.ContentType content_type, int64 filesize,
>+         int64 message_id, int64 attachment_id, Mime.ContentDisposition content_disposition,
>+         string? content_id, string? content_description) {
>+         base (generate_id(attachment_id),generate_file(data_dir, message_id, attachment_id, filename),
>
>Property changes on: mail/geary/files/patch-src_engine_imap-db_imap-db-attachment.vala
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: mail/geary/files/patch-src_engine_imap-db_imap-db-folder.vala
>===================================================================
>--- mail/geary/files/patch-src_engine_imap-db_imap-db-folder.vala	(nonexistent)
>+++ mail/geary/files/patch-src_engine_imap-db_imap-db-folder.vala	(working copy)
>@@ -0,0 +1,39 @@
>+--- src/engine/imap-db/imap-db-folder.vala.orig	2015-03-30 21:47:50 UTC
>++++ src/engine/imap-db/imap-db-folder.vala
>+@@ -876,9 +876,9 @@ private class Geary.ImapDB.Folder : BaseObject, Geary.
>+             unread_updated(unread_status);
>+     }
>+     
>+-    public async Gee.Map<ImapDB.EmailIdentifier, Geary.EmailFlags>? get_email_flags_async(
>+-        Gee.Collection<ImapDB.EmailIdentifier> ids, Cancellable? cancellable) throws Error {
>+-        Gee.Map<ImapDB.EmailIdentifier, Geary.EmailFlags>? map = null;
>++    internal async Gee.Map<ImapDB.EmailIdentifier, Geary.EmailFlags>? get_email_flags_async(
>++        Gee.Collection<EmailIdentifier> ids, Cancellable? cancellable) throws Error {
>++        Gee.Map<EmailIdentifier, Geary.EmailFlags>? map = null;
>+         yield db.exec_transaction_async(Db.TransactionType.RO, (cx, cancellable) => {
>+             map = do_get_email_flags(cx, ids, cancellable);
>+             
>+@@ -1090,11 +1090,11 @@ private class Geary.ImapDB.Folder : BaseObject, Geary.
>+         if (ids.size == 0)
>+             return null;
>+         
>+-        Gee.HashMap<Geary.EmailIdentifier, Geary.Email.Field> map = new Gee.HashMap<
>+-            Geary.EmailIdentifier, Geary.Email.Field>();
>++        Gee.HashMap<ImapDB.EmailIdentifier, Geary.Email.Field> map = new Gee.HashMap<
>++            ImapDB.EmailIdentifier, Geary.Email.Field>();
>+         
>+         // Break up the work
>+-        Gee.List<ImapDB.EmailIdentifier> list = new Gee.ArrayList<Geary.EmailIdentifier>();
>++        Gee.List<ImapDB.EmailIdentifier> list = new Gee.ArrayList<ImapDB.EmailIdentifier>();
>+         Gee.Iterator<ImapDB.EmailIdentifier> iter = ids.iterator();
>+         while (iter.next()) {
>+             list.add(iter.get());
>+@@ -1581,7 +1581,7 @@ private class Geary.ImapDB.Folder : BaseObject, Geary.
>+         Db.Statement fetch_stmt = cx.prepare("SELECT flags FROM MessageTable WHERE id=?");
>+         
>+         Gee.Map<ImapDB.EmailIdentifier, Geary.EmailFlags> map = new Gee.HashMap<
>+-            Geary.EmailIdentifier, Geary.EmailFlags>();
>++            ImapDB.EmailIdentifier, Geary.EmailFlags>();
>+         // TODO: Unroll this loop
>+         foreach (LocationIdentifier location in locs) {
>+             fetch_stmt.reset(Db.ResetScope.CLEAR_BINDINGS);
>
>Property changes on: mail/geary/files/patch-src_engine_imap-db_imap-db-folder.vala
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: mail/geary/files/patch-src_engine_imap-engine_imap-engine-generic-account.vala
>===================================================================
>--- mail/geary/files/patch-src_engine_imap-engine_imap-engine-generic-account.vala	(nonexistent)
>+++ mail/geary/files/patch-src_engine_imap-engine_imap-engine-generic-account.vala	(working copy)
>@@ -0,0 +1,20 @@
>+--- src/engine/imap-engine/imap-engine-generic-account.vala.orig	2015-03-30 21:47:50 UTC
>++++ src/engine/imap-engine/imap-engine-generic-account.vala
>+@@ -739,7 +739,7 @@ private abstract class Geary.ImapEngine.GenericAccount
>+         
>+         // If path in local but not remote (and isn't local-only, i.e. the Outbox), need to remove it
>+         Gee.ArrayList<Geary.Folder> to_remove
>+-            = Geary.traverse<Gee.Map.Entry<FolderPath, Imap.Folder>>(existing_folders)
>++            = Geary.traverse<Gee.Map.Entry<FolderPath,Geary.Folder>>(existing_folders)
>+             .filter(e => !remote_folders.has_key(e.key) && !local_only.has_key(e.key))
>+             .map<Geary.Folder>(e => (Geary.Folder) e.value)
>+             .to_array_list();
>+@@ -766,7 +766,7 @@ private abstract class Geary.ImapEngine.GenericAccount
>+                 debug("Unable to fetch local folder after cloning: %s", convert_err.message);
>+             }
>+         }
>+-        Gee.Collection<MinimalFolder> engine_added = new Gee.ArrayList<Geary.Folder>();
>++        Gee.Collection<MinimalFolder> engine_added = new Gee.ArrayList<MinimalFolder>();
>+         engine_added.add_all(build_folders(folders_to_build));
>+         
>+         Gee.ArrayList<Geary.Folder> engine_removed = new Gee.ArrayList<Geary.Folder>();
>
>Property changes on: mail/geary/files/patch-src_engine_imap-engine_imap-engine-generic-account.vala
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: mail/geary/files/patch-src_engine_imap-engine_imap-engine-minimal-folder.vala
>===================================================================
>--- mail/geary/files/patch-src_engine_imap-engine_imap-engine-minimal-folder.vala	(nonexistent)
>+++ mail/geary/files/patch-src_engine_imap-engine_imap-engine-minimal-folder.vala	(working copy)
>@@ -0,0 +1,13 @@
>+--- src/engine/imap-engine/imap-engine-minimal-folder.vala.orig	2015-03-30 21:47:50 UTC
>++++ src/engine/imap-engine/imap-engine-minimal-folder.vala
>+@@ -1413,7 +1413,9 @@ private class Geary.ImapEngine.MinimalFolder : Geary.F
>+         Cancellable? cancellable = null) throws Error {
>+         check_open("mark_email_async");
>+         
>+-        MarkEmail mark = new MarkEmail(this, to_mark, flags_to_add, flags_to_remove, cancellable);
>++        check_ids("mark_email_async", to_mark);
>++
>++        MarkEmail mark = new MarkEmail(this, (Gee.List<ImapDB.EmailIdentifier>) to_mark, flags_to_add, flags_to_remove, cancellable);
>+         replay_queue.schedule(mark);
>+         
>+         yield mark.wait_for_ready_async(cancellable);
>
>Property changes on: mail/geary/files/patch-src_engine_imap-engine_imap-engine-minimal-folder.vala
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: mail/geary/files/patch-src_engine_imap-engine_replay-ops_imap-engine-mark-email.vala
>===================================================================
>--- mail/geary/files/patch-src_engine_imap-engine_replay-ops_imap-engine-mark-email.vala	(nonexistent)
>+++ mail/geary/files/patch-src_engine_imap-engine_replay-ops_imap-engine-mark-email.vala	(working copy)
>@@ -0,0 +1,36 @@
>+--- src/engine/imap-engine/replay-ops/imap-engine-mark-email.vala.orig	2015-03-30 21:47:50 UTC
>++++ src/engine/imap-engine/replay-ops/imap-engine-mark-email.vala
>+@@ -6,13 +6,13 @@
>+ 
>+ private class Geary.ImapEngine.MarkEmail : Geary.ImapEngine.SendReplayOperation {
>+     private MinimalFolder engine;
>+-    private Gee.List<Geary.EmailIdentifier> to_mark = new Gee.ArrayList<Geary.EmailIdentifier>();
>++    private Gee.List<ImapDB.EmailIdentifier> to_mark = new Gee.ArrayList<ImapDB.EmailIdentifier>();
>+     private Geary.EmailFlags? flags_to_add;
>+     private Geary.EmailFlags? flags_to_remove;
>+     private Gee.Map<ImapDB.EmailIdentifier, Geary.EmailFlags>? original_flags = null;
>+     private Cancellable? cancellable;
>+     
>+-    public MarkEmail(MinimalFolder engine, Gee.List<Geary.EmailIdentifier> to_mark, 
>++    public MarkEmail(MinimalFolder engine, Gee.List<ImapDB.EmailIdentifier> to_mark, 
>+         Geary.EmailFlags? flags_to_add, Geary.EmailFlags? flags_to_remove, 
>+         Cancellable? cancellable = null) {
>+         base("MarkEmail", OnError.RETRY);
>+@@ -28,7 +28,7 @@ private class Geary.ImapEngine.MarkEmail : Geary.ImapE
>+     public override void notify_remote_removed_ids(Gee.Collection<ImapDB.EmailIdentifier> ids) {
>+         // don't bother updating on server or backing out locally
>+         if (original_flags != null)
>+-            Collection.map_unset_all_keys<ImapDB.EmailIdentifier, Geary.EmailFlags>(original_flags, ids);
>++            Collection.map_unset_all_keys<EmailIdentifier, Geary.EmailFlags>(original_flags, ids);
>+     }
>+     
>+     public override void get_ids_to_be_remote_removed(Gee.Collection<ImapDB.EmailIdentifier> ids) {
>+@@ -50,7 +50,7 @@ private class Geary.ImapEngine.MarkEmail : Geary.ImapE
>+             cancellable);
>+         
>+         // Notify using flags from DB.
>+-        Gee.Map<Geary.EmailIdentifier, Geary.EmailFlags>? map = yield engine.local_folder.get_email_flags_async(
>++        Gee.Map<EmailIdentifier, Geary.EmailFlags>? map = yield engine.local_folder.get_email_flags_async(
>+             original_flags.keys, cancellable);
>+         if (map != null && map.size > 0)
>+             engine.replay_notify_email_flags_changed(map);
>
>Property changes on: mail/geary/files/patch-src_engine_imap-engine_replay-ops_imap-engine-mark-email.vala
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: mail/geary/files/patch-src_engine_imap_response_imap-fetch-data-decoder.vala
>===================================================================
>--- mail/geary/files/patch-src_engine_imap_response_imap-fetch-data-decoder.vala	(nonexistent)
>+++ mail/geary/files/patch-src_engine_imap_response_imap-fetch-data-decoder.vala	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/engine/imap/response/imap-fetch-data-decoder.vala.orig	2015-03-30 21:47:50 UTC
>++++ src/engine/imap/response/imap-fetch-data-decoder.vala
>+@@ -95,7 +95,7 @@ public class Geary.Imap.MessageFlagsDecoder : Geary.Im
>+     }
>+     
>+     protected override MessageData decode_list(ListParameter listp) throws ImapError {
>+-        Gee.List<Flag> flags = new Gee.ArrayList<Flag>();
>++        Gee.List<MessageFlag> flags = new Gee.ArrayList<MessageFlag>();
>+         for (int ctr = 0; ctr < listp.size; ctr++)
>+             flags.add(new MessageFlag(listp.get_as_string(ctr).ascii));
>+         
>
>Property changes on: mail/geary/files/patch-src_engine_imap_response_imap-fetch-data-decoder.vala
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 222026: 186031 | 186086