Adapt to libcamel API changes in 3.57.1

mcrha · mcrha · commit ea5752418aff · 2025-10-17T11:47:50.000+02:00
The evolution-data-server 3.57.1 release contains API changes in libcamel,
which are incompatible with the previous versions. Bump the libcamel version
requirement, update the camel-1.2.vapi file and modify the sources accordingly.
diff --git a/meson.build b/meson.build
@@ -15,7 +15,7 @@ gobject_dep = dependency('gobject-2.0')
 granite_dep = dependency('granite', version: '>= 6.0.0')
 gee_dep = dependency('gee-0.8')
 handy_dep = dependency('libhandy-1', version: '>=1.1.90')
-camel_dep = dependency('camel-1.2', version: '>= 3.28')
+camel_dep = dependency('camel-1.2', version: '>= 3.57.1')
 libedataserver_dep = dependency('libedataserver-1.2', version: '>= 3.28')
 libedataserverui_dep = dependency('libedataserverui-1.2', version: '>=3.45.1')
 webkit2_dep = dependency('webkit2gtk-4.1')
diff --git a/src/Backend/MoveOperation.vala b/src/Backend/MoveOperation.vala
@@ -189,10 +189,9 @@ public class Mail.MoveOperation : Object {
             var vee_folder = (Camel.VeeFolder)src_folder;
 
             store = null;
-            unowned Camel.Folder? orig_folder = null;
 
             foreach (unowned Camel.MessageInfo message in moved_messages) {
-                orig_folder = vee_folder.get_vee_uid_folder (message.uid);
+                Camel.Folder? orig_folder = vee_folder.dup_vee_uid_folder (message.uid);
                 if (orig_folder != null) {
                     if (store != null && orig_folder.get_parent_store () != store) {
                         // Don't know which archive folder to use when messages are from
@@ -214,11 +213,11 @@ public class Mail.MoveOperation : Object {
     }
 
     private async void collect_thread_messages (Camel.FolderThreadNode thread) {
-        moved_messages.add (thread.message);
-        unowned Camel.FolderThreadNode? child = (Camel.FolderThreadNode?) thread.child;
+        moved_messages.add ((Camel.MessageInfo?) thread.get_item ());
+        unowned Camel.FolderThreadNode? child = (Camel.FolderThreadNode?) thread.get_child ();
         while (child != null) {
             yield collect_thread_messages (child);
-            child = (Camel.FolderThreadNode?) child.next;
+            child = (Camel.FolderThreadNode?) child.get_next ();
         }
     }
 
diff --git a/src/ConversationList/ConversationItemModel.vala b/src/ConversationList/ConversationItemModel.vala
@@ -46,7 +46,7 @@ public class Mail.ConversationItemModel : GLib.Object {
 
             unowned Camel.FolderThreadNode? current_node = node;
             while (current_node != null) {
-                weak Camel.MessageInfo? message = current_node.message;
+                weak Camel.MessageInfo? message = (Camel.MessageInfo?) current_node.get_item ();
                 if (message != null) {
                     var address = new Camel.InternetAddress ();
                     if (address.decode (message.from) > 0) {
@@ -67,7 +67,7 @@ public class Mail.ConversationItemModel : GLib.Object {
                     }
                 }
 
-                current_node = (Camel.FolderThreadNode?) current_node.child;
+                current_node = (Camel.FolderThreadNode?) current_node.get_child ();
             }
 
             if (senders.length > 0) {
@@ -84,7 +84,7 @@ public class Mail.ConversationItemModel : GLib.Object {
 
             unowned Camel.FolderThreadNode? current_node = node;
             while (current_node != null) {
-                weak Camel.MessageInfo? message = current_node.message;
+                weak Camel.MessageInfo? message = (Camel.MessageInfo?) current_node.get_item ();
                 if (message != null) {
                     var address = new Camel.InternetAddress ();
                     if (address.decode (message.to) > 0) {
@@ -105,7 +105,7 @@ public class Mail.ConversationItemModel : GLib.Object {
                     }
                 }
 
-                current_node = (Camel.FolderThreadNode?) current_node.child;
+                current_node = (Camel.FolderThreadNode?) current_node.get_child ();
             }
 
             if (recipients.length > 0) {
@@ -118,7 +118,7 @@ public class Mail.ConversationItemModel : GLib.Object {
 
     public string subject {
         get {
-            weak Camel.MessageInfo? message = node.message;
+            weak Camel.MessageInfo? message = (Camel.MessageInfo?) node.get_item ();
             if (message == null) {
                 return _("Unknown");
             }
@@ -129,7 +129,7 @@ public class Mail.ConversationItemModel : GLib.Object {
 
     public bool flagged {
         get {
-            weak Camel.MessageInfo? message = node.message;
+            weak Camel.MessageInfo? message = (Camel.MessageInfo?) node.get_item ();
             if (message == null) {
                 return false;
             }
@@ -140,7 +140,7 @@ public class Mail.ConversationItemModel : GLib.Object {
 
     public bool forwarded {
         get {
-            weak Camel.MessageInfo? message = node.message;
+            weak Camel.MessageInfo? message = (Camel.MessageInfo?) node.get_item ();
             if (message == null) {
                 return false;
             }
@@ -151,7 +151,7 @@ public class Mail.ConversationItemModel : GLib.Object {
 
     public bool replied {
         get {
-            weak Camel.MessageInfo? message = node.message;
+            weak Camel.MessageInfo? message = (Camel.MessageInfo?) node.get_item ();
             if (message == null) {
                 return false;
             }
@@ -162,7 +162,7 @@ public class Mail.ConversationItemModel : GLib.Object {
 
     public bool replied_all {
         get {
-            weak Camel.MessageInfo? message = node.message;
+            weak Camel.MessageInfo? message = (Camel.MessageInfo?) node.get_item ();
             if (message == null) {
                 return false;
             }
@@ -179,7 +179,7 @@ public class Mail.ConversationItemModel : GLib.Object {
 
     public bool deleted {
         get {
-            weak Camel.MessageInfo? message = node.message;
+            weak Camel.MessageInfo? message = (Camel.MessageInfo?) node.get_item ();
             if (message == null) {
                 return false;
             }
@@ -204,7 +204,7 @@ public class Mail.ConversationItemModel : GLib.Object {
 
     private static uint count_thread_messages (Camel.FolderThreadNode node) {
         uint i = 1;
-        for (unowned Camel.FolderThreadNode? child = node.child; child != null; child = child.next) {
+        for (unowned Camel.FolderThreadNode? child = node.get_child (); child != null; child = child.get_next ()) {
             i += count_thread_messages (child);
         }
 
@@ -217,13 +217,13 @@ public class Mail.ConversationItemModel : GLib.Object {
             return time;
         }
 
-        weak Camel.MessageInfo? message = node.message;
+        weak Camel.MessageInfo? message = (Camel.MessageInfo?) node.get_item ();
         if (message != null) {
             time = int64.max (time, message.date_received);
             time = int64.max (time, message.date_sent);
         }
 
-        for (unowned Camel.FolderThreadNode? child = node.child; child != null; child = child.next) {
+        for (unowned Camel.FolderThreadNode? child = node.get_child (); child != null; child = child.get_next ()) {
             time = get_newest_timestamp (child, time);
         }
 
@@ -235,10 +235,10 @@ public class Mail.ConversationItemModel : GLib.Object {
             return false;
         }
 
-        var has_flag = !(flag in (int)node.message.flags);
+        var has_flag = !(flag in (int)((Camel.MessageInfo?) node.get_item ()).flags);
 
         if (!has_flag) {
-            for (unowned Camel.FolderThreadNode? child = node.child; child != null; child = child.next) {
+            for (unowned Camel.FolderThreadNode? child = node.get_child (); child != null; child = child.get_next ()) {
                 has_flag = has_thread_flag (child, flag);
                 if (has_flag) {
                     break;
diff --git a/src/ConversationList/ConversationList.vala b/src/ConversationList/ConversationList.vala
@@ -213,11 +213,11 @@ public class Mail.ConversationList : Gtk.Box {
             return;
         }
 
-        if (!(flag in (int)node.message.flags)) {
-            node.message.set_flags (flag, ~0);
+        if (!(flag in (int)((Camel.MessageInfo?) node.get_item ()).flags)) {
+            ((Camel.MessageInfo?) node.get_item ()).set_flags (flag, ~0);
         }
 
-        for (unowned Camel.FolderThreadNode? child = node.child; child != null; child = child.next) {
+        for (unowned Camel.FolderThreadNode? child = node.get_child (); child != null; child = child.get_next ()) {
             set_thread_flag (child, flag);
         }
     }
@@ -269,17 +269,17 @@ public class Mail.ConversationList : Gtk.Box {
 
                                 var search_result_uids = get_search_result_uids (current_account.service.uid);
                                 if (search_result_uids != null) {
-                                    var thread = new Camel.FolderThread (folder, search_result_uids, false);
+                                    var thread = new Camel.FolderThread (folder, (GLib.GenericArray<string>?) search_result_uids, Camel.FolderThreadFlags.NONE);
                                     threads[current_account.service.uid] = thread;
 
-                                    weak Camel.FolderThreadNode? child = thread.tree;
+                                    weak Camel.FolderThreadNode? child = thread.get_tree ();
                                     while (child != null) {
                                         if (cancellable.is_cancelled ()) {
                                             break;
                                         }
 
                                         add_conversation_item (folder_info_flags[current_account.service.uid], child, thread, current_account.service.uid);
-                                        child = child.next;
+                                        child = child.get_next ();
                                     }
                                 }
                             } catch (Error e) {
@@ -326,7 +326,7 @@ public class Mail.ConversationList : Gtk.Box {
                     return;
                 }
 
-                threads[service_uid] = new Camel.FolderThread (folders[service_uid], search_result_uids, false);
+                threads[service_uid] = new Camel.FolderThread (folders[service_uid], (GLib.GenericArray<string>?) search_result_uids, Camel.FolderThreadFlags.NONE);
 
                 var removed = 0;
                 change_info.get_removed_uids ().foreach ((uid) => {
@@ -338,33 +338,33 @@ public class Mail.ConversationList : Gtk.Box {
                     }
                 });
 
-                unowned Camel.FolderThreadNode? child = threads[service_uid].tree;
+                unowned Camel.FolderThreadNode? child = threads[service_uid].get_tree ();
                 while (child != null) {
                     if (cancellable.is_cancelled ()) {
                         return;
                     }
 
-                    var item = conversations[child.message.uid];
+                    var item = conversations[((Camel.MessageInfo?) child.get_item ()).uid];
                     if (item == null) {
                         add_conversation_item (folder_info_flags[service_uid], child, threads[service_uid], service_uid);
                     } else {
                         if (item.is_older_than (child)) {
-                            conversations.unset (child.message.uid);
+                            conversations.unset (((Camel.MessageInfo?) child.get_item ()).uid);
                             list_store.remove (item);
                             removed++;
                             add_conversation_item (folder_info_flags[service_uid], child, threads[service_uid], service_uid);
                         };
                     }
 
-                    child = child.next;
+                    child = child.get_next ();
                 }
 
                 list_store.items_changed (0, removed, list_store.get_n_items ());
             }
         }
     }
 
-    private GenericArray<string>? get_search_result_uids (string service_uid) {
+    private GenericArray<weak string>? get_search_result_uids (string service_uid) {
         var style_context = filter_button.get_style_context ();
         if (hide_read_switch.active || hide_unstarred_switch.active) {
             if (!style_context.has_class (Granite.STYLE_CLASS_ACCENT)) {
@@ -381,7 +381,7 @@ public class Mail.ConversationList : Gtk.Box {
 
             var has_current_search_query = search_entry.text.strip () != "";
             if (!has_current_search_query && !hide_read_switch.active && !hide_unstarred_switch.active) {
-                return folders[service_uid].get_uids ();
+                return folders[service_uid].dup_uids ();
             }
 
             string[] current_search_expressions = {};
@@ -406,20 +406,22 @@ public class Mail.ConversationList : Gtk.Box {
             string search_query = "(match-all (and " + string.joinv ("", current_search_expressions) + "))";
 
             try {
-                return folders[service_uid].search_by_expression (search_query, cancellable);
+                GenericArray<weak string>? uids = null;
+                folders[service_uid].search_sync (search_query, out uids, cancellable);
+                return uids;
             } catch (Error e) {
                 if (!(e is GLib.IOError.CANCELLED)) {
                     warning ("Error while searching: %s", e.message);
                 }
 
-                return folders[service_uid].get_uids ();
+                return folders[service_uid].dup_uids ();
             }
         }
     }
 
     private void add_conversation_item (Camel.FolderInfoFlags folder_info_flags, Camel.FolderThreadNode child, Camel.FolderThread thread, string service_uid) {
         var item = new ConversationItemModel (folder_info_flags, child, thread, service_uid);
-        conversations[child.message.uid] = item;
+        conversations[((Camel.MessageInfo?) child.get_item ()).uid] = item;
         list_store.add (item);
     }
 
@@ -439,28 +441,28 @@ public class Mail.ConversationList : Gtk.Box {
     public void mark_read_selected_messages () {
         var selected_rows = list_box.get_selected_rows ();
         foreach (var row in selected_rows) {
-            (((ConversationItemModel)row).node).message.set_flags (Camel.MessageFlags.SEEN, ~0);
+            ((Camel.MessageInfo?) (((ConversationItemModel)row).node).get_item ()).set_flags (Camel.MessageFlags.SEEN, ~0);
         }
     }
 
     public void mark_star_selected_messages () {
         var selected_rows = list_box.get_selected_rows ();
         foreach (var row in selected_rows) {
-            (((ConversationItemModel)row).node).message.set_flags (Camel.MessageFlags.FLAGGED, ~0);
+            ((Camel.MessageInfo?) (((ConversationItemModel)row).node).get_item ()).set_flags (Camel.MessageFlags.FLAGGED, ~0);
         }
     }
 
     public void mark_unread_selected_messages () {
         var selected_rows = list_box.get_selected_rows ();
         foreach (var row in selected_rows) {
-            (((ConversationItemModel)row).node).message.set_flags (Camel.MessageFlags.SEEN, 0);
+            ((Camel.MessageInfo?) (((ConversationItemModel)row).node).get_item ()).set_flags (Camel.MessageFlags.SEEN, 0);
         }
     }
 
     public void mark_unstar_selected_messages () {
         var selected_rows = list_box.get_selected_rows ();
         foreach (var row in selected_rows) {
-            (((ConversationItemModel)row).node).message.set_flags (Camel.MessageFlags.FLAGGED, 0);
+            ((Camel.MessageInfo?) (((ConversationItemModel)row).node).get_item ()).set_flags (Camel.MessageFlags.FLAGGED, 0);
         }
     }
 
diff --git a/src/MessageList/MessageList.vala b/src/MessageList/MessageList.vala
@@ -179,14 +179,14 @@ public class Mail.MessageList : Gtk.Box {
          */
         can_move_thread (true);
 
-        var store = node.message.summary.folder.parent_store;
+        var store = ((Camel.MessageInfo?) node.get_item ()).summary.folder.parent_store;
         folder_popover.set_store (store);
 
-        var item = new MessageListItem (node.message);
+        var item = new MessageListItem ((Camel.MessageInfo?) node.get_item ());
         list_box.add (item);
-        messages.set (node.message.uid, item);
-        if (node.child != null) {
-            go_down ((Camel.FolderThreadNode?) node.child);
+        messages.set (((Camel.MessageInfo?) node.get_item ()).uid, item);
+        if (node.get_child () != null) {
+            go_down ((Camel.FolderThreadNode?) node.get_child ());
         }
 
         var children = list_box.get_children ();
@@ -203,22 +203,22 @@ public class Mail.MessageList : Gtk.Box {
             }
         }
 
-        if (node.message != null && Camel.MessageFlags.DRAFT in (int) node.message.flags) {
+        if (node.get_item () != null && Camel.MessageFlags.DRAFT in (int) ((Camel.MessageInfo?) node.get_item ()).flags) {
             compose.begin (Composer.Type.DRAFT, "");
         }
     }
 
     private void go_down (Camel.FolderThreadNode node) {
         unowned Camel.FolderThreadNode? current_node = node;
         while (current_node != null) {
-            var item = new MessageListItem (current_node.message);
+            var item = new MessageListItem ((Camel.MessageInfo?) current_node.get_item ());
             list_box.add (item);
-            messages.set (current_node.message.uid, item);
-            if (current_node.next != null) {
-                go_down ((Camel.FolderThreadNode?) current_node.next);
+            messages.set (((Camel.MessageInfo?) current_node.get_item ()).uid, item);
+            if (current_node.get_next () != null) {
+                go_down ((Camel.FolderThreadNode?) current_node.get_next ());
             }
 
-            current_node = (Camel.FolderThreadNode?) current_node.child;
+            current_node = (Camel.FolderThreadNode?) current_node.get_child ();
         }
     }
 
diff --git a/vapi/camel-1.2.vapi b/vapi/camel-1.2.vapi

Original file line number	Diff line number	Diff line change
`@@ -213,11 +213,11 @@ public class Mail.ConversationList : Gtk.Box {`
`213`	`213`	`return;`
`214`	`214`	`}`
`215`	`215`
`216`		`- if (!(flag in (int)node.message.flags)) {`
`217`		`- node.message.set_flags (flag, ~0);`
	`216`	`+ if (!(flag in (int)((Camel.MessageInfo?) node.get_item ()).flags)) {`
	`217`	`+ ((Camel.MessageInfo?) node.get_item ()).set_flags (flag, ~0);`
`218`	`218`	`}`
`219`	`219`
`220`		`- for (unowned Camel.FolderThreadNode? child = node.child; child != null; child = child.next) {`
	`220`	`+ for (unowned Camel.FolderThreadNode? child = node.get_child (); child != null; child = child.get_next ()) {`
`221`	`221`	`set_thread_flag (child, flag);`
`222`	`222`	`}`
`223`	`223`	`}`
`@@ -269,17 +269,17 @@ public class Mail.ConversationList : Gtk.Box {`
`269`	`269`
`270`	`270`	`var search_result_uids = get_search_result_uids (current_account.service.uid);`
`271`	`271`	`if (search_result_uids != null) {`
`272`		`- var thread = new Camel.FolderThread (folder, search_result_uids, false);`
	`272`	`+ var thread = new Camel.FolderThread (folder, (GLib.GenericArray<string>?) search_result_uids, Camel.FolderThreadFlags.NONE);`
`273`	`273`	`threads[current_account.service.uid] = thread;`
`274`	`274`
`275`		`- weak Camel.FolderThreadNode? child = thread.tree;`
	`275`	`+ weak Camel.FolderThreadNode? child = thread.get_tree ();`
`276`	`276`	`while (child != null) {`
`277`	`277`	`if (cancellable.is_cancelled ()) {`
`278`	`278`	`break;`
`279`	`279`	`}`
`280`	`280`
`281`	`281`	`add_conversation_item (folder_info_flags[current_account.service.uid], child, thread, current_account.service.uid);`
`282`		`- child = child.next;`
	`282`	`+ child = child.get_next ();`
`283`	`283`	`}`
`284`	`284`	`}`
`285`	`285`	`} catch (Error e) {`
`@@ -326,7 +326,7 @@ public class Mail.ConversationList : Gtk.Box {`
`326`	`326`	`return;`
`327`	`327`	`}`
`328`	`328`
`329`		`- threads[service_uid] = new Camel.FolderThread (folders[service_uid], search_result_uids, false);`
	`329`	`+ threads[service_uid] = new Camel.FolderThread (folders[service_uid], (GLib.GenericArray<string>?) search_result_uids, Camel.FolderThreadFlags.NONE);`
`330`	`330`
`331`	`331`	`var removed = 0;`
`332`	`332`	`change_info.get_removed_uids ().foreach ((uid) => {`
`@@ -338,33 +338,33 @@ public class Mail.ConversationList : Gtk.Box {`
`338`	`338`	`}`
`339`	`339`	`});`
`340`	`340`
`341`		`- unowned Camel.FolderThreadNode? child = threads[service_uid].tree;`
	`341`	`+ unowned Camel.FolderThreadNode? child = threads[service_uid].get_tree ();`
`342`	`342`	`while (child != null) {`
`343`	`343`	`if (cancellable.is_cancelled ()) {`
`344`	`344`	`return;`
`345`	`345`	`}`
`346`	`346`
`347`		`- var item = conversations[child.message.uid];`
	`347`	`+ var item = conversations[((Camel.MessageInfo?) child.get_item ()).uid];`
`348`	`348`	`if (item == null) {`
`349`	`349`	`add_conversation_item (folder_info_flags[service_uid], child, threads[service_uid], service_uid);`
`350`	`350`	`} else {`
`351`	`351`	`if (item.is_older_than (child)) {`
`352`		`- conversations.unset (child.message.uid);`
	`352`	`+ conversations.unset (((Camel.MessageInfo?) child.get_item ()).uid);`
`353`	`353`	`list_store.remove (item);`
`354`	`354`	`removed++;`
`355`	`355`	`add_conversation_item (folder_info_flags[service_uid], child, threads[service_uid], service_uid);`
`356`	`356`	`};`
`357`	`357`	`}`
`358`	`358`
`359`		`- child = child.next;`
	`359`	`+ child = child.get_next ();`
`360`	`360`	`}`
`361`	`361`
`362`	`362`	`list_store.items_changed (0, removed, list_store.get_n_items ());`
`363`	`363`	`}`
`364`	`364`	`}`
`365`	`365`	`}`
`366`	`366`
`367`		`- private GenericArray<string>? get_search_result_uids (string service_uid) {`
	`367`	`+ private GenericArray<weak string>? get_search_result_uids (string service_uid) {`
`368`	`368`	`var style_context = filter_button.get_style_context ();`
`369`	`369`	`if (hide_read_switch.active \|\| hide_unstarred_switch.active) {`
`370`	`370`	`if (!style_context.has_class (Granite.STYLE_CLASS_ACCENT)) {`
`@@ -381,7 +381,7 @@ public class Mail.ConversationList : Gtk.Box {`
`381`	`381`
`382`	`382`	`var has_current_search_query = search_entry.text.strip () != "";`
`383`	`383`	`if (!has_current_search_query && !hide_read_switch.active && !hide_unstarred_switch.active) {`
`384`		`- return folders[service_uid].get_uids ();`
	`384`	`+ return folders[service_uid].dup_uids ();`
`385`	`385`	`}`
`386`	`386`
`387`	`387`	`string[] current_search_expressions = {};`
`@@ -406,20 +406,22 @@ public class Mail.ConversationList : Gtk.Box {`
`406`	`406`	`string search_query = "(match-all (and " + string.joinv ("", current_search_expressions) + "))";`
`407`	`407`
`408`	`408`	`try {`
`409`		`- return folders[service_uid].search_by_expression (search_query, cancellable);`
	`409`	`+ GenericArray<weak string>? uids = null;`
	`410`	`+ folders[service_uid].search_sync (search_query, out uids, cancellable);`
	`411`	`+ return uids;`
`410`	`412`	`} catch (Error e) {`
`411`	`413`	`if (!(e is GLib.IOError.CANCELLED)) {`
`412`	`414`	`warning ("Error while searching: %s", e.message);`
`413`	`415`	`}`
`414`	`416`
`415`		`- return folders[service_uid].get_uids ();`
	`417`	`+ return folders[service_uid].dup_uids ();`
`416`	`418`	`}`
`417`	`419`	`}`
`418`	`420`	`}`
`419`	`421`
`420`	`422`	`private void add_conversation_item (Camel.FolderInfoFlags folder_info_flags, Camel.FolderThreadNode child, Camel.FolderThread thread, string service_uid) {`
`421`	`423`	`var item = new ConversationItemModel (folder_info_flags, child, thread, service_uid);`
`422`		`- conversations[child.message.uid] = item;`
	`424`	`+ conversations[((Camel.MessageInfo?) child.get_item ()).uid] = item;`
`423`	`425`	`list_store.add (item);`
`424`	`426`	`}`
`425`	`427`
`@@ -439,28 +441,28 @@ public class Mail.ConversationList : Gtk.Box {`
`439`	`441`	`public void mark_read_selected_messages () {`
`440`	`442`	`var selected_rows = list_box.get_selected_rows ();`
`441`	`443`	`foreach (var row in selected_rows) {`
`442`		`- (((ConversationItemModel)row).node).message.set_flags (Camel.MessageFlags.SEEN, ~0);`
	`444`	`+ ((Camel.MessageInfo?) (((ConversationItemModel)row).node).get_item ()).set_flags (Camel.MessageFlags.SEEN, ~0);`
`443`	`445`	`}`
`444`	`446`	`}`
`445`	`447`
`446`	`448`	`public void mark_star_selected_messages () {`
`447`	`449`	`var selected_rows = list_box.get_selected_rows ();`
`448`	`450`	`foreach (var row in selected_rows) {`
`449`		`- (((ConversationItemModel)row).node).message.set_flags (Camel.MessageFlags.FLAGGED, ~0);`
	`451`	`+ ((Camel.MessageInfo?) (((ConversationItemModel)row).node).get_item ()).set_flags (Camel.MessageFlags.FLAGGED, ~0);`
`450`	`452`	`}`
`451`	`453`	`}`
`452`	`454`
`453`	`455`	`public void mark_unread_selected_messages () {`
`454`	`456`	`var selected_rows = list_box.get_selected_rows ();`
`455`	`457`	`foreach (var row in selected_rows) {`
`456`		`- (((ConversationItemModel)row).node).message.set_flags (Camel.MessageFlags.SEEN, 0);`
	`458`	`+ ((Camel.MessageInfo?) (((ConversationItemModel)row).node).get_item ()).set_flags (Camel.MessageFlags.SEEN, 0);`
`457`	`459`	`}`
`458`	`460`	`}`
`459`	`461`
`460`	`462`	`public void mark_unstar_selected_messages () {`
`461`	`463`	`var selected_rows = list_box.get_selected_rows ();`
`462`	`464`	`foreach (var row in selected_rows) {`
`463`		`- (((ConversationItemModel)row).node).message.set_flags (Camel.MessageFlags.FLAGGED, 0);`
	`465`	`+ ((Camel.MessageInfo?) (((ConversationItemModel)row).node).get_item ()).set_flags (Camel.MessageFlags.FLAGGED, 0);`
`464`	`466`	`}`
`465`	`467`	`}`
`466`	`468`
Original file line number	Diff line number	Diff line change
`@@ -179,14 +179,14 @@ public class Mail.MessageList : Gtk.Box {`
`179`	`179`	`*/`
`180`	`180`	`can_move_thread (true);`
`181`	`181`
`182`		`- var store = node.message.summary.folder.parent_store;`
	`182`	`+ var store = ((Camel.MessageInfo?) node.get_item ()).summary.folder.parent_store;`
`183`	`183`	`folder_popover.set_store (store);`
`184`	`184`
`185`		`- var item = new MessageListItem (node.message);`
	`185`	`+ var item = new MessageListItem ((Camel.MessageInfo?) node.get_item ());`
`186`	`186`	`list_box.add (item);`
`187`		`- messages.set (node.message.uid, item);`
`188`		`- if (node.child != null) {`
`189`		`- go_down ((Camel.FolderThreadNode?) node.child);`
	`187`	`+ messages.set (((Camel.MessageInfo?) node.get_item ()).uid, item);`
	`188`	`+ if (node.get_child () != null) {`
	`189`	`+ go_down ((Camel.FolderThreadNode?) node.get_child ());`
`190`	`190`	`}`
`191`	`191`
`192`	`192`	`var children = list_box.get_children ();`
`@@ -203,22 +203,22 @@ public class Mail.MessageList : Gtk.Box {`
`203`	`203`	`}`
`204`	`204`	`}`
`205`	`205`
`206`		`- if (node.message != null && Camel.MessageFlags.DRAFT in (int) node.message.flags) {`
	`206`	`+ if (node.get_item () != null && Camel.MessageFlags.DRAFT in (int) ((Camel.MessageInfo?) node.get_item ()).flags) {`
`207`	`207`	`compose.begin (Composer.Type.DRAFT, "");`
`208`	`208`	`}`
`209`	`209`	`}`
`210`	`210`
`211`	`211`	`private void go_down (Camel.FolderThreadNode node) {`
`212`	`212`	`unowned Camel.FolderThreadNode? current_node = node;`
`213`	`213`	`while (current_node != null) {`
`214`		`- var item = new MessageListItem (current_node.message);`
	`214`	`+ var item = new MessageListItem ((Camel.MessageInfo?) current_node.get_item ());`
`215`	`215`	`list_box.add (item);`
`216`		`- messages.set (current_node.message.uid, item);`
`217`		`- if (current_node.next != null) {`
`218`		`- go_down ((Camel.FolderThreadNode?) current_node.next);`
	`216`	`+ messages.set (((Camel.MessageInfo?) current_node.get_item ()).uid, item);`
	`217`	`+ if (current_node.get_next () != null) {`
	`218`	`+ go_down ((Camel.FolderThreadNode?) current_node.get_next ());`
`219`	`219`	`}`
`220`	`220`
`221`		`- current_node = (Camel.FolderThreadNode?) current_node.child;`
	`221`	`+ current_node = (Camel.FolderThreadNode?) current_node.get_child ();`
`222`	`222`	`}`
`223`	`223`	`}`
`224`	`224`