Attachment #186086 for bug #222026




--- src/client/accounts/account-dialog-account-list-pane.vala.orig	2017-09-05 17:04:03 UTC
+++ src/client/accounts/account-dialog-account-list-pane.vala
@@ -158,7 +158,11 @@ public class AccountDialogAccountListPane : AccountDia
         if (iter == null)
             return;
         
+#if VALA_0_36
+        list_model.remove(ref iter);
+#else
         list_model.remove(iter);
+#endif
     }
     
     private void on_account_changed(Object object, ParamSpec p) {




--- 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");
         }




--- 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,11 @@ public class ConversationListStore : Gtk.ListStore {
         if (last_email == null) {
             debug("Cannot refresh conversation: last email is null");
             
+#if VALA_0_36
+            remove(ref iter);
+#else
             remove(iter);
+#endif
             return;
         }
         
@@ -385,7 +389,11 @@ public class ConversationListStore : Gtk.ListStore {
     private void remove_conversation(Geary.App.Conversation conversation) {
         Gtk.TreeIter iter;
         if (get_iter_for_conversation(conversation, out iter))
+#if VALA_0_36
+            remove(ref iter);
+#else
             remove(iter);
+#endif
         
         row_map.remove(conversation);
     }

Line 0 Link Here

(-)mail/geary/files/patch-src_client_util_util-date.vala (+11 lines)
	1	--- src/client/util/util-date.vala.orig 2015-03-30 21:47:50 UTC
	2	+++ src/client/util/util-date.vala
	3	@@ -164,7 +164,7 @@ private string pretty_print_coarse(CoarseDate coarse_d
	4	return _("Now");
	5
	6	case CoarseDate.MINUTES:
	7	- return ngettext("%dm ago", "%dm ago", (ulong) (diff / TimeSpan.MINUTE)).printf(diff / TimeSpan.MINUTE);
	8	+ return ngettext("%dm ago", "%dm ago", (ulong) (diff / TimeSpan.MINUTE)).printf((int) (diff / TimeSpan.MINUTE));
	9
	10	case CoarseDate.HOURS:
	11	int rounded = (int) Math.round((double) diff / TimeSpan.HOUR);

Line 0 Link Here

(-)mail/geary/files/patch-src_engine_db_db-transaction-async-job.vala (+11 lines)
	1	--- src/engine/db/db-transaction-async-job.vala.orig 2015-03-30 21:47:50 UTC
	2	+++ src/engine/db/db-transaction-async-job.vala
	3	@@ -12,7 +12,7 @@ private class Geary.Db.TransactionAsyncJob : BaseObjec
	4	private TransactionOutcome outcome = TransactionOutcome.ROLLBACK;
	5	private Error? caught_err = null;
	6
	7	- protected TransactionAsyncJob(TransactionType type, TransactionMethod cb, Cancellable? cancellable) {
	8	+ public TransactionAsyncJob(TransactionType type, TransactionMethod cb, Cancellable? cancellable) {
	9	this.type = type;
	10	this.cb = cb;
	11	this.cancellable = cancellable ?? new Cancellable();

Line 0 Link Here

(-)mail/geary/files/patch-src_engine_imap-db_imap-db-attachment.vala (+11 lines)
	1	--- src/engine/imap-db/imap-db-attachment.vala.orig 2015-03-30 21:47:50 UTC
	2	+++ src/engine/imap-db/imap-db-attachment.vala
	3	@@ -9,7 +9,7 @@ private class Geary.ImapDB.Attachment : Geary.Attachme
	4
	5	private const string ATTACHMENTS_DIR = "attachments";
	6
	7	- protected Attachment(File data_dir, string? filename, Mime.ContentType content_type, int64 filesize,
	8	+ public Attachment(File data_dir, string? filename, Mime.ContentType content_type, int64 filesize,
	9	int64 message_id, int64 attachment_id, Mime.ContentDisposition content_disposition,
	10	string? content_id, string? content_description) {
	11	base (generate_id(attachment_id),generate_file(data_dir, message_id, attachment_id, filename),




--- 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);




--- 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>();




--- 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);




--- 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);

Line 0 Link Here

(-)mail/geary/files/patch-src_engine_imap_response_imap-fetch-data-decoder.vala (+11 lines)
	1	--- src/engine/imap/response/imap-fetch-data-decoder.vala.orig 2015-03-30 21:47:50 UTC
	2	+++ src/engine/imap/response/imap-fetch-data-decoder.vala
	3	@@ -95,7 +95,7 @@ public class Geary.Imap.MessageFlagsDecoder : Geary.Im
	4	}
	5
	6	protected override MessageData decode_list(ListParameter listp) throws ImapError {
	7	- Gee.List<Flag> flags = new Gee.ArrayList<Flag>();
	8	+ Gee.List<MessageFlag> flags = new Gee.ArrayList<MessageFlag>();
	9	for (int ctr = 0; ctr < listp.size; ctr++)
	10	flags.add(new MessageFlag(listp.get_as_string(ctr).ascii));
	11

Return to bug 222026

Line 0 Link Here

(-)mail/geary/files/patch-src_client_accounts_account-dialog-account-list-pane.vala (+14 lines)
	1	--- src/client/accounts/account-dialog-account-list-pane.vala.orig 2017-09-05 17:04:03 UTC
	2	+++ src/client/accounts/account-dialog-account-list-pane.vala
	3	@@ -158,7 +158,11 @@ public class AccountDialogAccountListPane : AccountDia
	4	if (iter == null)
	5	return;
	6
	7	+#if VALA_0_36
	8	+ list_model.remove(ref iter);
	9	+#else
	10	list_model.remove(iter);
	11	+#endif
	12	}
	13
	14	private void on_account_changed(Object object, ParamSpec p) {

Line 0 Link Here

(-)mail/geary/files/patch-src_client_components_conversation-find-bar.vala (+14 lines)
	1	--- src/client/components/conversation-find-bar.vala.orig 2015-03-30 21:47:50 UTC
	2	+++ src/client/components/conversation-find-bar.vala
	3	@@ -211,9 +211,9 @@ public class ConversationFindBar : Gtk.Layout {
	4
	5	if (matches > 0) {
	6	if (!wrapped)
	7	- content += ngettext("%i match", "%i matches", matches).printf(matches);
	8	+ content += ngettext("%i match", "%i matches", matches).printf((int) matches);
	9	else
	10	- content += ngettext("%i match (wrapped)", "%i matches (wrapped)", matches).printf(matches);
	11	+ content += ngettext("%i match (wrapped)", "%i matches (wrapped)", matches).printf((int) matches);
	12	} else {
	13	content += _("not found");
	14	}

Line 0 Link Here

(-)mail/geary/files/patch-src_client_conversation-list_conversation-list-store.vala (+26 lines)
	1	--- src/client/conversation-list/conversation-list-store.vala.orig 2015-03-30 21:47:50 UTC
	2	+++ src/client/conversation-list/conversation-list-store.vala
	3	@@ -313,7 +313,11 @@ public class ConversationListStore : Gtk.ListStore {
	4	if (last_email == null) {
	5	debug("Cannot refresh conversation: last email is null");
	6
	7	+#if VALA_0_36
	8	+ remove(ref iter);
	9	+#else
	10	remove(iter);
	11	+#endif
	12	return;
	13	}
	14
	15	@@ -385,7 +389,11 @@ public class ConversationListStore : Gtk.ListStore {
	16	private void remove_conversation(Geary.App.Conversation conversation) {
	17	Gtk.TreeIter iter;
	18	if (get_iter_for_conversation(conversation, out iter))
	19	+#if VALA_0_36
	20	+ remove(ref iter);
	21	+#else
	22	remove(iter);
	23	+#endif
	24
	25	row_map.remove(conversation);
	26	}

Line 0 Link Here

(-)mail/geary/files/patch-src_engine_imap-db_imap-db-folder.vala (+39 lines)
	1	--- src/engine/imap-db/imap-db-folder.vala.orig 2015-03-30 21:47:50 UTC
	2	+++ src/engine/imap-db/imap-db-folder.vala
	3	@@ -876,9 +876,9 @@ private class Geary.ImapDB.Folder : BaseObject, Geary.
	4	unread_updated(unread_status);
	5	}
	6
	7	- public async Gee.Map<ImapDB.EmailIdentifier, Geary.EmailFlags>? get_email_flags_async(
	8	- Gee.Collection<ImapDB.EmailIdentifier> ids, Cancellable? cancellable) throws Error {
	9	- Gee.Map<ImapDB.EmailIdentifier, Geary.EmailFlags>? map = null;
	10	+ internal async Gee.Map<ImapDB.EmailIdentifier, Geary.EmailFlags>? get_email_flags_async(
	11	+ Gee.Collection<EmailIdentifier> ids, Cancellable? cancellable) throws Error {
	12	+ Gee.Map<EmailIdentifier, Geary.EmailFlags>? map = null;
	13	yield db.exec_transaction_async(Db.TransactionType.RO, (cx, cancellable) => {
	14	map = do_get_email_flags(cx, ids, cancellable);
	15
	16	@@ -1090,11 +1090,11 @@ private class Geary.ImapDB.Folder : BaseObject, Geary.
	17	if (ids.size == 0)
	18	return null;
	19
	20	- Gee.HashMap<Geary.EmailIdentifier, Geary.Email.Field> map = new Gee.HashMap<
	21	- Geary.EmailIdentifier, Geary.Email.Field>();
	22	+ Gee.HashMap<ImapDB.EmailIdentifier, Geary.Email.Field> map = new Gee.HashMap<
	23	+ ImapDB.EmailIdentifier, Geary.Email.Field>();
	24
	25	// Break up the work
	26	- Gee.List<ImapDB.EmailIdentifier> list = new Gee.ArrayList<Geary.EmailIdentifier>();
	27	+ Gee.List<ImapDB.EmailIdentifier> list = new Gee.ArrayList<ImapDB.EmailIdentifier>();
	28	Gee.Iterator<ImapDB.EmailIdentifier> iter = ids.iterator();
	29	while (iter.next()) {
	30	list.add(iter.get());
	31	@@ -1581,7 +1581,7 @@ private class Geary.ImapDB.Folder : BaseObject, Geary.
	32	Db.Statement fetch_stmt = cx.prepare("SELECT flags FROM MessageTable WHERE id=?");
	33
	34	Gee.Map<ImapDB.EmailIdentifier, Geary.EmailFlags> map = new Gee.HashMap<
	35	- Geary.EmailIdentifier, Geary.EmailFlags>();
	36	+ ImapDB.EmailIdentifier, Geary.EmailFlags>();
	37	// TODO: Unroll this loop
	38	foreach (LocationIdentifier location in locs) {
	39	fetch_stmt.reset(Db.ResetScope.CLEAR_BINDINGS);

Line 0 Link Here

(-)mail/geary/files/patch-src_engine_imap-engine_imap-engine-generic-account.vala (+20 lines)
	1	--- src/engine/imap-engine/imap-engine-generic-account.vala.orig 2015-03-30 21:47:50 UTC
	2	+++ src/engine/imap-engine/imap-engine-generic-account.vala
	3	@@ -739,7 +739,7 @@ private abstract class Geary.ImapEngine.GenericAccount
	4
	5	// If path in local but not remote (and isn't local-only, i.e. the Outbox), need to remove it
	6	Gee.ArrayList<Geary.Folder> to_remove
	7	- = Geary.traverse<Gee.Map.Entry<FolderPath, Imap.Folder>>(existing_folders)
	8	+ = Geary.traverse<Gee.Map.Entry<FolderPath,Geary.Folder>>(existing_folders)
	9	.filter(e => !remote_folders.has_key(e.key) && !local_only.has_key(e.key))
	10	.map<Geary.Folder>(e => (Geary.Folder) e.value)
	11	.to_array_list();
	12	@@ -766,7 +766,7 @@ private abstract class Geary.ImapEngine.GenericAccount
	13	debug("Unable to fetch local folder after cloning: %s", convert_err.message);
	14	}
	15	}
	16	- Gee.Collection<MinimalFolder> engine_added = new Gee.ArrayList<Geary.Folder>();
	17	+ Gee.Collection<MinimalFolder> engine_added = new Gee.ArrayList<MinimalFolder>();
	18	engine_added.add_all(build_folders(folders_to_build));
	19
	20	Gee.ArrayList<Geary.Folder> engine_removed = new Gee.ArrayList<Geary.Folder>();

Line 0 Link Here

(-)mail/geary/files/patch-src_engine_imap-engine_imap-engine-minimal-folder.vala (+13 lines)
	1	--- src/engine/imap-engine/imap-engine-minimal-folder.vala.orig 2015-03-30 21:47:50 UTC
	2	+++ src/engine/imap-engine/imap-engine-minimal-folder.vala
	3	@@ -1413,7 +1413,9 @@ private class Geary.ImapEngine.MinimalFolder : Geary.F
	4	Cancellable? cancellable = null) throws Error {
	5	check_open("mark_email_async");
	6
	7	- MarkEmail mark = new MarkEmail(this, to_mark, flags_to_add, flags_to_remove, cancellable);
	8	+ check_ids("mark_email_async", to_mark);
	9	+
	10	+ MarkEmail mark = new MarkEmail(this, (Gee.List<ImapDB.EmailIdentifier>) to_mark, flags_to_add, flags_to_remove, cancellable);
	11	replay_queue.schedule(mark);
	12
	13	yield mark.wait_for_ready_async(cancellable);

Line 0 Link Here

(-)mail/geary/files/patch-src_engine_imap-engine_replay-ops_imap-engine-mark-email.vala (+36 lines)
	1	--- src/engine/imap-engine/replay-ops/imap-engine-mark-email.vala.orig 2015-03-30 21:47:50 UTC
	2	+++ src/engine/imap-engine/replay-ops/imap-engine-mark-email.vala
	3	@@ -6,13 +6,13 @@
	4
	5	private class Geary.ImapEngine.MarkEmail : Geary.ImapEngine.SendReplayOperation {
	6	private MinimalFolder engine;
	7	- private Gee.List<Geary.EmailIdentifier> to_mark = new Gee.ArrayList<Geary.EmailIdentifier>();
	8	+ private Gee.List<ImapDB.EmailIdentifier> to_mark = new Gee.ArrayList<ImapDB.EmailIdentifier>();
	9	private Geary.EmailFlags? flags_to_add;
	10	private Geary.EmailFlags? flags_to_remove;
	11	private Gee.Map<ImapDB.EmailIdentifier, Geary.EmailFlags>? original_flags = null;
	12	private Cancellable? cancellable;
	13
	14	- public MarkEmail(MinimalFolder engine, Gee.List<Geary.EmailIdentifier> to_mark,
	15	+ public MarkEmail(MinimalFolder engine, Gee.List<ImapDB.EmailIdentifier> to_mark,
	16	Geary.EmailFlags? flags_to_add, Geary.EmailFlags? flags_to_remove,
	17	Cancellable? cancellable = null) {
	18	base("MarkEmail", OnError.RETRY);
	19	@@ -28,7 +28,7 @@ private class Geary.ImapEngine.MarkEmail : Geary.ImapE
	20	public override void notify_remote_removed_ids(Gee.Collection<ImapDB.EmailIdentifier> ids) {
	21	// don't bother updating on server or backing out locally
	22	if (original_flags != null)
	23	- Collection.map_unset_all_keys<ImapDB.EmailIdentifier, Geary.EmailFlags>(original_flags, ids);
	24	+ Collection.map_unset_all_keys<EmailIdentifier, Geary.EmailFlags>(original_flags, ids);
	25	}
	26
	27	public override void get_ids_to_be_remote_removed(Gee.Collection<ImapDB.EmailIdentifier> ids) {
	28	@@ -50,7 +50,7 @@ private class Geary.ImapEngine.MarkEmail : Geary.ImapE
	29	cancellable);
	30
	31	// Notify using flags from DB.
	32	- Gee.Map<Geary.EmailIdentifier, Geary.EmailFlags>? map = yield engine.local_folder.get_email_flags_async(
	33	+ Gee.Map<EmailIdentifier, Geary.EmailFlags>? map = yield engine.local_folder.get_email_flags_async(
	34	original_flags.keys, cancellable);
	35	if (map != null && map.size > 0)
	36	engine.replay_notify_email_flags_changed(map);