* src/modest-ui-actions.c:

        * On deleting messages from viewer, if there's no next message
          or user cancels retrieving next message, we close the window
          (fixes NB#64684).
* src/modest-mail-operation.c:
        * Get the TnyCamelMemStream type before opening threads so that
          we don't get the initial type in parallel from two threads
          (due to a possible thread problem in gtype system).

pmo-trunk-r2872

diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c
index 9d48dae..3e1ef15 100644 (file)
--- a/src/modest-mail-operation.c
+++ b/src/modest-mail-operation.c
@@ -2046,6 +2046,8 @@ modest_mail_operation_get_mime_part_size (ModestMailOperation *self,
        info->callback = user_callback;
        info->userdata = user_data;
 
+       tny_camel_mem_stream_get_type ();
+
        thread = g_thread_create (get_mime_part_size_thread, info, FALSE, NULL);
 
 }

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index da6c745..976ea1f 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -288,7 +288,10 @@ void modest_ui_actions_refresh_message_window_after_delete (ModestMsgViewWindow*
                modest_msg_view_window_first_message_selected (win)) {
                modest_ui_actions_on_close_window (NULL, MODEST_WINDOW (win));
        } else {
-               modest_msg_view_window_select_next_message (win);
+               if (!modest_msg_view_window_select_next_message (win)) {
+                       gboolean ret_value;
+                       g_signal_emit_by_name (G_OBJECT (win), "delete-event", NULL, &ret_value);
+               }
        }
 }