Fix modest_utils_show_dialog_and_forget for gtk and modest shell

[modest] / src / widgets / modest-msg-view-window.c

diff --git a/src/widgets/modest-msg-view-window.c b/src/widgets/modest-msg-view-window.c
index d46db30..7be874e 100644 (file)
--- a/src/widgets/modest-msg-view-window.c
+++ b/src/widgets/modest-msg-view-window.c
@@ -287,8 +287,8 @@ modest_msg_view_window_get_type (void)
                        (GInstanceInitFunc) modest_msg_view_window_init,
                        NULL
                };
-#ifdef MODEST_TOOLKIT_GTK
-               my_type = g_type_register_static (MODEST_TYPE_WINDOW,
+#ifndef MODEST_TOOLKIT_HILDON2
+               my_type = g_type_register_static (MODEST_TYPE_SHELL_WINDOW,
                                                  "ModestMsgViewWindow",
                                                  &my_info, 0);
 #else
@@ -1897,6 +1897,7 @@ message_reader_performer (gboolean canceled,
        info = (MsgReaderInfo *) user_data;
        if (canceled || err) {
                update_window_title (MODEST_MSG_VIEW_WINDOW (parent_window));
+               modest_ui_actions_on_close_window (NULL, MODEST_WINDOW (parent_window));
                goto frees;
        }