* Dim the delete icon and menu entry from the msg-view-window if the

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

diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c
index b123c57..030c387 100644 (file)
--- a/src/modest-ui-dimming-rules.c
+++ b/src/modest-ui-dimming-rules.c
@@ -67,7 +67,6 @@ static gboolean _msg_download_in_progress (ModestWindow *win);
 static gboolean _msg_download_completed (ModestMainWindow *win);
 static gboolean _selected_msg_sent_in_progress (ModestWindow *win);
 static gboolean _sending_in_progress (ModestWindow *win);
-static gboolean _send_receive_in_progress (ModestWindow *win);
 static gboolean _invalid_folder_for_purge (ModestWindow *win, ModestDimmingRule *rule);
 static gboolean _transfer_mode_enabled (ModestWindow *win);
 static gboolean _selected_folder_has_subfolder_with_same_name (ModestWindow *win);
@@ -753,6 +752,11 @@ modest_ui_dimming_rules_on_delete_msg (ModestWindow *win, gpointer user_data)
                        if (dimmed)
                                modest_dimming_rule_set_notification (rule, _("mcen_ib_message_already_deleted"));
                }
+               if (!dimmed) {
+                       dimmed = state->sent_in_progress;
+                       if (dimmed)
+                               modest_dimming_rule_set_notification (rule, _CS("ckct_ib_unable_to_delete"));
+               }
                
                /* The delete button should be dimmed when viewing an attachment,
                 * but should be enabled when viewing a message from the list, 
@@ -1696,7 +1700,7 @@ modest_ui_dimming_rules_on_csm_cancel_sending (ModestWindow *win, gpointer user_
                        modest_dimming_rule_set_notification (rule, "");
        }
        if (!dimmed) {
-               dimmed = !_send_receive_in_progress (win);
+               dimmed = !_sending_in_progress (win);
                if (dimmed)
                        modest_dimming_rule_set_notification (rule, "");
        }
@@ -2173,7 +2177,9 @@ _folder_is_any_of_type (TnyFolder *folder,
 
        /* Get folder type */
        folder_type = modest_tny_folder_guess_folder_type (folder);
-               
+       if (folder_type == TNY_FOLDER_TYPE_INVALID)
+               g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__);
+       
        /* Check foler type */
        for (i=0; i < ntypes; i++) {
                result = result || folder_type == types[i];
@@ -2472,23 +2478,9 @@ _sending_in_progress (ModestWindow *win)
 }
 
 static gboolean
-_send_receive_in_progress (ModestWindow *win)
-{
-       gboolean result = FALSE;
-       
-       g_return_val_if_fail (MODEST_IS_MAIN_WINDOW (win), FALSE);
-
-       /* Check if send operation is in progress */
-       result = modest_main_window_send_receive_in_progress (MODEST_MAIN_WINDOW (win));
-
-       return result;
-}
-
-static gboolean
 _invalid_folder_for_purge (ModestWindow *win, 
                           ModestDimmingRule *rule)
 {
-       TnyMsg *msg = NULL;
        TnyFolder *folder = NULL;
        TnyAccount *account = NULL;
        gboolean result = FALSE;
@@ -2496,14 +2488,14 @@ _invalid_folder_for_purge (ModestWindow *win,
        if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
 
                /* Get folder and account of message */
-               msg = modest_msg_view_window_get_message (MODEST_MSG_VIEW_WINDOW (win));
+               TnyMsg *msg = modest_msg_view_window_get_message (MODEST_MSG_VIEW_WINDOW (win));
                g_return_val_if_fail(msg != NULL, TRUE);                        
                folder = tny_msg_get_folder (msg);      
+               g_object_unref (msg);
                if (folder == NULL) {
                        modest_dimming_rule_set_notification (rule, _("mail_ib_unable_to_purge_attachments"));
                        goto frees;
                }
-               g_object_unref (msg);
        } else if (MODEST_IS_MAIN_WINDOW (win)) {
                GtkWidget *folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
                                                                              MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
@@ -2607,9 +2599,9 @@ _selected_folder_has_subfolder_with_same_name (ModestWindow *win)
        if (folder_name == NULL) goto frees;
 
        /* Check source subfolders names */
-       result = modest_tny_folder_has_subfolder_with_name (folder, folder_name);
-       
-       
+       result = modest_tny_folder_has_subfolder_with_name (folder, folder_name,
+                                                           TRUE);
+               
        /* Free */
  frees:
        if (folder != NULL)