Don't show mail_ib_attachment_already_purged, as this string

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

diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c
index cac4d9c..c8b12ea 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, "");
        }
@@ -2366,8 +2370,10 @@ _purged_attach_selected (ModestWindow *win, gboolean all, ModestDimmingRule *rul
        else
                result = (purged > 0);
 
+       /* This string no longer exists, refer to NB#75415 for more info
        if (result && (rule != NULL))
                modest_dimming_rule_set_notification (rule, _("mail_ib_attachment_already_purged"));
+       */
 
        return result;
 }
@@ -2474,23 +2480,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;
@@ -2498,14 +2490,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);