* Fixes NB#86208, set the "close all" dialog modal to main window which is presented

[modest] / src / modest-ui-dimming-rules.c

diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c
index c5ec36b..2bf5454 100644 (file)
--- a/src/modest-ui-dimming-rules.c
+++ b/src/modest-ui-dimming-rules.c
@@ -38,6 +38,7 @@
 #include "modest-debug.h"
 #include "modest-tny-folder.h"
 #include "modest-tny-account.h"
+#include "modest-tny-mime-part.h"
 #include "modest-text-utils.h"
 #include <widgets/modest-attachments-view.h>
 #include <modest-runtime.h>
@@ -1020,6 +1021,14 @@ modest_ui_dimming_rules_on_view_window_move_to (ModestWindow *win, gpointer user
                if (dimmed)
                        modest_dimming_rule_set_notification (rule, _("mail_ib_notavailable_downloading"));
        }
+       if (!dimmed) {
+               dimmed = modest_window_get_dimming_state (win)->any_marked_as_deleted;
+               if (dimmed) {
+                       gchar *msg = modest_ui_actions_get_msg_already_deleted_error_msg (win);
+                       modest_dimming_rule_set_notification (rule, msg);
+                       g_free (msg);
+               }
+       }
        
        if (!dimmed) {
                dimmed = _selected_msg_sent_in_progress (win);
@@ -1592,7 +1601,7 @@ modest_ui_dimming_rules_on_send (ModestWindow *win, gpointer user_data)
 
                dimmed = (subject == NULL || subject[0] == '\0');
                if (dimmed)
-                       modest_dimming_rule_set_notification (rule, _("mcen_ib_subject_or_body_not_modified"));
+                       modest_dimming_rule_set_notification (rule, _("mcen_ib_subject_not_modified"));
        }
               
        if (!dimmed) {
@@ -2401,7 +2410,7 @@ _invalid_attach_selected (ModestWindow *win,
                        while (!tny_iterator_is_done (iter) && !result) {
                                TnyMimePart *mime_part = TNY_MIME_PART (tny_iterator_get_current (iter));
                                TnyList *nested_list = tny_simple_list_new ();
-                               if (!for_remove && TNY_IS_MSG (mime_part)) {
+                               if (!for_remove && modest_tny_mime_part_is_msg (mime_part)) {
                                        selected_messages = TRUE;
                                        result = TRUE;
                                }
@@ -2619,7 +2628,8 @@ _invalid_folder_for_purge (ModestWindow *win,
                                                                              MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
                if (!folder_view)
                        return FALSE;
-               folder = TNY_FOLDER (modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view)));
+               folder = (TnyFolder *) modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
+               /* Could be a folder store */
                if (folder == NULL || ! TNY_IS_FOLDER (folder))
                        goto frees;             
        } else {