X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-ui-dimming-rules.c;h=2bf54544f7183947b7383ea3bdc75208e9f765d6;hp=57c09703b3cc84d6881b77de392412768e6aaebe;hb=25809b1fab3c3e78f97c332131dab4d517187eac;hpb=7892ff311689f6e9896f2eec3bf6451839f64ab5 diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c index 57c0970..2bf5454 100644 --- 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 #include @@ -70,7 +71,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 _invalid_account_for_purge (ModestWindow *win, ModestDimmingRule *rule); 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); @@ -1021,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); @@ -1240,14 +1248,11 @@ modest_ui_dimming_rules_on_remove_attachments (ModestWindow *win, gpointer user_ } } - /* cannot purge in pop accounts */ - if (!dimmed) { - dimmed = _invalid_account_for_purge (win, rule); - } - /* cannot purge in editable drafts nor pop folders */ if (!dimmed) { dimmed = _invalid_folder_for_purge (win, rule); + if (dimmed) + modest_dimming_rule_set_notification (rule, _("mail_ib_unable_to_purge_attachments")); } /* Check if the selected message in main window has attachments */ @@ -1596,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) { @@ -2405,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; } @@ -2600,49 +2605,6 @@ _sending_in_progress (ModestWindow *win) } static gboolean -_invalid_account_for_purge (ModestWindow *win, - ModestDimmingRule *rule) -{ - const gchar *account_name; - ModestTnyAccountStore *account_store; - TnyAccount *store_account = NULL; - gboolean result = FALSE; - const gchar *protocol_name; - - account_name = modest_window_get_active_account (win); - if (account_name == NULL) - goto frees; - - account_store = modest_runtime_get_account_store (); - store_account = modest_tny_account_store_get_server_account (account_store, account_name, TNY_ACCOUNT_TYPE_STORE); - if (store_account == NULL) - goto frees; - - protocol_name = tny_account_get_proto (store_account); - if (modest_protocol_info_get_transport_store_protocol (protocol_name) == MODEST_PROTOCOL_STORE_POP) { - gint n_selected = 0; - result = TRUE; - - if (MODEST_IS_MSG_VIEW_WINDOW (win)) { - TnyList *attachments; - attachments = modest_msg_view_window_get_attachments (MODEST_MSG_VIEW_WINDOW(win)); - n_selected = tny_list_get_length (attachments); - g_object_unref (attachments); - } - - modest_dimming_rule_set_notification (rule, - ngettext ("mail_ib_unable_to_pure_attach_pop_mail_singular", - "mail_ib_unable_to_pure_attach_pop_mail_plural", - n_selected)); - - } -frees: - if (store_account) - g_object_unref (store_account); - return result; -} - -static gboolean _invalid_folder_for_purge (ModestWindow *win, ModestDimmingRule *rule) { @@ -2658,7 +2620,7 @@ _invalid_folder_for_purge (ModestWindow *win, 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")); + result = TRUE; goto frees; } } else if (MODEST_IS_MAIN_WINDOW (win)) { @@ -2666,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 { @@ -2683,31 +2646,14 @@ _invalid_folder_for_purge (ModestWindow *win, if (_selected_folder_is_any_of_type (win, types, 2)) { result = TRUE; - modest_dimming_rule_set_notification (rule, _("mail_ib_unable_to_purge_editable_msg")); - } else { - result = FALSE; } } else { const gchar *proto_str = tny_account_get_proto (TNY_ACCOUNT (account)); - /* If it's POP then dim */ - if (modest_protocol_info_get_transport_store_protocol (proto_str) == - MODEST_PROTOCOL_STORE_POP) { - TnyList *attachments = NULL; - gint n_selected = 0; + ModestTransportStoreProtocol proto; + proto = modest_protocol_info_get_transport_store_protocol (proto_str); + /* If it's a remote folder then dim */ + if (proto == MODEST_PROTOCOL_STORE_POP || proto == MODEST_PROTOCOL_STORE_IMAP) { result = TRUE; - - /* TODO: This check is here to prevent a gwarning, but this looks like a logic error. - * murrayc */ - if (MODEST_IS_MSG_VIEW_WINDOW (win)) { - attachments = modest_msg_view_window_get_attachments (MODEST_MSG_VIEW_WINDOW(win)); - n_selected = tny_list_get_length (attachments); - g_object_unref (attachments); - } - - modest_dimming_rule_set_notification (rule, - ngettext ("mail_ib_unable_to_pure_attach_pop_mail_singular", - "mail_ib_unable_to_pure_attach_pop_mail_plural", - n_selected)); } }