X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-ui-dimming-rules.c;h=50ef80b681537460d6ebe5117cbcbfa5f5ce0e5a;hp=77b6d9b0570b498d236a3a722b497065550f4f22;hb=d27a0a29347366d5421e7e796eca4655ef0d095a;hpb=969c95e82a89f9e439b243a00677715fd5d0d59a diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c index 77b6d9b..50ef80b 100644 --- a/src/modest-ui-dimming-rules.c +++ b/src/modest-ui-dimming-rules.c @@ -33,7 +33,9 @@ #include #include "modest-ui-dimming-rules.h" +#include "modest-ui-actions.h" #include "modest-dimming-rule.h" +#include "modest-debug.h" #include "modest-tny-folder.h" #include "modest-tny-account.h" #include "modest-text-utils.h" @@ -41,6 +43,7 @@ #include #include #include +#include static gboolean _folder_is_any_of_type (TnyFolder *folder, TnyFolderType types[], guint ntypes); @@ -67,7 +70,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); @@ -318,7 +320,6 @@ modest_ui_dimming_rules_define_dimming_state (ModestWindow *window) return state; } - gboolean modest_ui_dimming_rules_on_new_msg (ModestWindow *win, gpointer user_data) { @@ -360,9 +361,20 @@ modest_ui_dimming_rules_on_new_folder (ModestWindow *win, gpointer user_data) g_return_val_if_fail (MODEST_IS_DIMMING_RULE (user_data), FALSE); rule = MODEST_DIMMING_RULE (user_data); + if (!dimmed) { + dimmed = _transfer_mode_enabled (win); + if (dimmed) { + modest_dimming_rule_set_notification (rule, _("mail_in_ui_folder_create_error")); + return dimmed; + } + } + /* Get selected folder as parent of new folder to create */ folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(win), MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); + if (!folder_view) /* folder view may not have been created yet */ + return TRUE; + parent_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view)); if (!parent_folder) return TRUE; @@ -561,6 +573,11 @@ modest_ui_dimming_rules_on_rename_folder (ModestWindow *win, gpointer user_data) if (dimmed) modest_dimming_rule_set_notification (rule, ""); } + if (!dimmed) { + dimmed = _transfer_mode_enabled (win); + if (dimmed) + modest_dimming_rule_set_notification (rule, ""); + } return dimmed; } @@ -583,8 +600,11 @@ modest_ui_dimming_rules_on_open_msg (ModestWindow *win, gpointer user_data) } if (!dimmed) { dimmed = state->any_marked_as_deleted; - if (dimmed) - modest_dimming_rule_set_notification (rule, _("mcen_ib_message_already_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); @@ -605,19 +625,20 @@ modest_ui_dimming_rules_on_reply_msg (ModestWindow *win, gpointer user_data) g_return_val_if_fail (MODEST_IS_DIMMING_RULE (user_data), FALSE); rule = MODEST_DIMMING_RULE (user_data); + types[0] = TNY_FOLDER_TYPE_DRAFTS; + types[1] = TNY_FOLDER_TYPE_OUTBOX; + types[2] = TNY_FOLDER_TYPE_ROOT; + + /* Check dimmed rule */ + if (!dimmed) { + dimmed = _selected_folder_is_any_of_type (win, types, 3); + if (dimmed) + modest_dimming_rule_set_notification (rule, _("mcen_ib_unable_to_reply")); + } + /* main window dimming rules */ if (MODEST_IS_MAIN_WINDOW(win)) { - types[0] = TNY_FOLDER_TYPE_DRAFTS; - types[1] = TNY_FOLDER_TYPE_OUTBOX; - types[2] = TNY_FOLDER_TYPE_ROOT; - - /* Check dimmed rule */ - if (!dimmed) { - dimmed = _selected_folder_is_any_of_type (win, types, 3); - if (dimmed) - modest_dimming_rule_set_notification (rule, _("mcen_ib_unable_to_reply")); - } if (!dimmed) { dimmed = _selected_folder_is_empty (MODEST_MAIN_WINDOW(win)); if (dimmed) @@ -720,7 +741,9 @@ modest_ui_dimming_rules_on_delete_msg (ModestWindow *win, gpointer user_data) if (!dimmed) { dimmed = state->any_marked_as_deleted; if (dimmed) { - modest_dimming_rule_set_notification (rule, _("mcen_ib_message_already_deleted")); + gchar *msg = modest_ui_actions_get_msg_already_deleted_error_msg (win); + modest_dimming_rule_set_notification (rule, msg); + g_free (msg); } } if (!dimmed) { @@ -737,8 +760,16 @@ modest_ui_dimming_rules_on_delete_msg (ModestWindow *win, gpointer user_data) } if (!dimmed) { dimmed = state->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 = state->sent_in_progress; if (dimmed) - modest_dimming_rule_set_notification (rule, _("mcen_ib_message_already_deleted")); + modest_dimming_rule_set_notification (rule, _CS("ckct_ib_unable_to_delete")); } /* The delete button should be dimmed when viewing an attachment, @@ -823,6 +854,13 @@ modest_ui_dimming_rules_on_details (ModestWindow *win, gpointer user_data) if (dimmed) modest_dimming_rule_set_notification (rule, ""); } + if (!dimmed) { + if (!modest_msg_view_window_is_search_result (MODEST_MSG_VIEW_WINDOW(win))) { + dimmed = !modest_msg_view_window_has_headers_model (MODEST_MSG_VIEW_WINDOW (win)); + } + if (dimmed) + modest_dimming_rule_set_notification (rule, ""); + } } return dimmed; @@ -921,7 +959,7 @@ modest_ui_dimming_rules_on_main_window_move_to (ModestWindow *win, gpointer user /* Check diming rules for folders transfer */ - if (gtk_widget_is_focus (folder_view)) { + if (folder_view && gtk_widget_is_focus (folder_view)) { TnyFolderType types[5]; types[0] = TNY_FOLDER_TYPE_DRAFTS; @@ -934,12 +972,12 @@ modest_ui_dimming_rules_on_main_window_move_to (ModestWindow *win, gpointer user if (!dimmed) { dimmed = _selected_folder_not_moveable (MODEST_MAIN_WINDOW(win)); if (dimmed) - modest_dimming_rule_set_notification (rule, _("emev_bd_unabletomove_items")); + modest_dimming_rule_set_notification (rule, _("emev_nc_unabletomove_items")); } if (!dimmed) { dimmed = _selected_folder_is_any_of_type (win, types, 5); if (dimmed) - modest_dimming_rule_set_notification (rule, _("emev_bd_unabletomove_itemsr")); + modest_dimming_rule_set_notification (rule, _("emev_nc_unabletomove_items")); } } @@ -947,14 +985,14 @@ modest_ui_dimming_rules_on_main_window_move_to (ModestWindow *win, gpointer user if (!dimmed) { dimmed = (state->already_opened_msg > 0) ? TRUE : FALSE; if (dimmed) { - gchar *message = g_strdup_printf(_("emev_bd_unabletomove_items"), + gchar *message = g_strdup_printf(_("emev_nc_unabletomove_items"), state->already_opened_msg); modest_dimming_rule_set_notification (rule, message); g_free(message); } } if (!dimmed) { - if (!gtk_widget_is_focus (folder_view)) + if (!(folder_view && gtk_widget_is_focus (folder_view))) dimmed = _invalid_msg_selected (MODEST_MAIN_WINDOW(win), FALSE, user_data); } @@ -985,6 +1023,11 @@ modest_ui_dimming_rules_on_view_window_move_to (ModestWindow *win, gpointer user } if (!dimmed) { + dimmed = _selected_msg_sent_in_progress (win); + if (dimmed) + modest_dimming_rule_set_notification (rule, _("emev_nc_unabletomove_item")); + } + if (!dimmed) { if (MODEST_IS_MSG_VIEW_WINDOW (win)) { /* The move_to button should be dimmed when viewing an attachment, * but should be enabled when viewing a message from the list, @@ -996,7 +1039,7 @@ modest_ui_dimming_rules_on_view_window_move_to (ModestWindow *win, gpointer user } if (dimmed) - modest_dimming_rule_set_notification (rule, _("mcen_ib_unable_to_move_mail_attachment")); + modest_dimming_rule_set_notification (rule, _("emev_nc_unabletomove_item")); } return dimmed; @@ -1069,12 +1112,12 @@ modest_ui_dimming_rules_on_paste (ModestWindow *win, gpointer user_data) if (!dimmed) { dimmed = _selected_folder_is_same_as_source (win); if (dimmed) - modest_dimming_rule_set_notification (rule, _("mcen_ib_unable_to_copy_samefolder")); + modest_dimming_rule_set_notification (rule, _("mail_in_ui_folder_copy_target_error")); } if (!dimmed) { dimmed = _selected_folder_has_subfolder_with_same_name (win); if (dimmed) - modest_dimming_rule_set_notification (rule, _("mcen_ib_unable_to_copy_samefolder")); + modest_dimming_rule_set_notification (rule, _("mail_in_ui_folder_copy_target_error")); } return dimmed; @@ -1189,6 +1232,14 @@ modest_ui_dimming_rules_on_remove_attachments (ModestWindow *win, gpointer user_ modest_dimming_rule_set_notification (rule, _("FIXME:no attachment selected")); } + if (!dimmed) { + + dimmed = _selected_msg_sent_in_progress (win); + if (dimmed) { + modest_dimming_rule_set_notification (rule, _("mail_ib_unable_to_purge_attachments")); + } + } + /* cannot purge in editable drafts nor pop folders */ if (!dimmed) { dimmed = _invalid_folder_for_purge (win, rule); @@ -1306,17 +1357,17 @@ modest_ui_dimming_rules_on_cut (ModestWindow *win, gpointer user_data) if (!dimmed) { dimmed = _selected_folder_not_deletable (MODEST_MAIN_WINDOW(win)); if (dimmed) - modest_dimming_rule_set_notification (rule, _("emev_bd_unabletomove_items")); + modest_dimming_rule_set_notification (rule, _("emev_nc_unabletomove_items")); } if (!dimmed) { dimmed = _selected_folder_is_root_or_inbox (MODEST_MAIN_WINDOW(win)); if (dimmed) - modest_dimming_rule_set_notification (rule, _("emev_bd_unabletomove_itemsr")); + modest_dimming_rule_set_notification (rule, _("emev_nc_unabletomove_items")); } if (!dimmed) { dimmed = _selected_folder_is_any_of_type (win, types, 3); if (dimmed) - modest_dimming_rule_set_notification (rule, _("emev_bd_unabletomove_itemsr")); + modest_dimming_rule_set_notification (rule, _("emev_nc_unabletomove_items")); } } } @@ -1330,7 +1381,7 @@ modest_ui_dimming_rules_on_copy (ModestWindow *win, gpointer user_data) ModestDimmingRule *rule = NULL; const DimmedState *state = NULL; gboolean dimmed = FALSE; - + g_return_val_if_fail (MODEST_IS_DIMMING_RULE (user_data), FALSE); rule = MODEST_DIMMING_RULE (user_data); state = modest_window_get_dimming_state (win); @@ -1473,8 +1524,10 @@ modest_ui_dimming_rules_on_editor_paste (ModestWindow *win, gpointer user_data) if (!dimmed) { ModestEmailClipboard *e_clipboard = modest_runtime_get_email_clipboard (); + const gchar *clipboard_text = modest_msg_edit_window_get_clipboard_text (MODEST_MSG_EDIT_WINDOW (win)); + dimmed = modest_email_clipboard_cleared (e_clipboard) && - (modest_msg_edit_window_get_clipboard_text(MODEST_MSG_EDIT_WINDOW (win)) != NULL); + ((clipboard_text == NULL) || (clipboard_text[0] == '\0')); } return dimmed; @@ -1493,7 +1546,7 @@ modest_ui_dimming_rules_on_editor_remove_attachment (ModestWindow *win, gpointer state = modest_window_get_dimming_state (win); if (!dimmed) { - GList *selected_attachments = NULL; + TnyList *selected_attachments = NULL; gint n_att_selected = 0; GtkWidget *attachments_view; attachments_view = modest_msg_edit_window_get_child_widget ( @@ -1502,10 +1555,10 @@ modest_ui_dimming_rules_on_editor_remove_attachment (ModestWindow *win, gpointer selected_attachments = modest_attachments_view_get_selection ( MODEST_ATTACHMENTS_VIEW (attachments_view)); - n_att_selected = g_list_length (selected_attachments); - g_list_free (selected_attachments); + n_att_selected = tny_list_get_length (selected_attachments); + g_object_unref (selected_attachments); - dimmed = (n_att_selected != 1); + dimmed = (n_att_selected < 1); } return dimmed; @@ -1682,7 +1735,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, ""); } @@ -1710,21 +1763,69 @@ modest_ui_dimming_rules_on_send_receive (ModestWindow *win, gpointer user_data) return dimmed; } +gboolean +modest_ui_dimming_rules_on_send_receive_all (ModestWindow *win, gpointer user_data) +{ + ModestDimmingRule *rule = NULL; + gboolean dimmed = FALSE; + + g_return_val_if_fail (MODEST_IS_DIMMING_RULE (user_data), FALSE); + rule = MODEST_DIMMING_RULE (user_data); + + /* Check dimmed rule */ + if (!dimmed) { + GSList *account_names = modest_account_mgr_account_names (modest_runtime_get_account_mgr (), TRUE); + if (g_slist_length (account_names) <= 1) + dimmed = TRUE; + if (dimmed) + modest_dimming_rule_set_notification (rule, _("mcen_nc_no_email_acnts_defined")); + + modest_account_mgr_free_account_names (account_names); + } + + return dimmed; +} + gboolean modest_ui_dimming_rules_on_add_to_contacts (ModestWindow *win, gpointer user_data) { ModestDimmingRule *rule = NULL; gboolean dimmed = FALSE; + GtkWidget *focused = NULL; g_return_val_if_fail (MODEST_IS_DIMMING_RULE (user_data), FALSE); rule = MODEST_DIMMING_RULE (user_data); + focused = gtk_window_get_focus (GTK_WINDOW (win)); + + dimmed = !focused; - /* Check dimmed rule */ if (!dimmed) { - GtkClipboard *clipboard = gtk_clipboard_get (GDK_SELECTION_PRIMARY); gchar *selection = NULL; - selection = gtk_clipboard_wait_for_text (clipboard); - + if (GTK_IS_TEXT_VIEW (focused)) { + GtkTextIter start, end; + GtkTextBuffer *buffer = NULL; + buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (focused)); + if (gtk_text_buffer_get_selection_bounds (buffer, &start, &end)) { + selection = gtk_text_buffer_get_text (buffer, &start, &end, FALSE); + } + } else if (GTK_IS_LABEL (focused)) { + selection = modest_text_utils_label_get_selection (GTK_LABEL (focused)); + } else { + gboolean do_check = TRUE; + GtkClipboard *clipboard; + if (GTK_IS_HTML (focused)) { + const gchar *sel; + int len = -1; + sel = gtk_html_get_selection_html (GTK_HTML (focused), &len); + do_check = !((sel == NULL) || (sel[0] == '\0')); + } + if (do_check) { + clipboard = gtk_clipboard_get (GDK_SELECTION_PRIMARY); + selection = gtk_clipboard_wait_for_text (clipboard); + } else { + selection = NULL; + } + } dimmed = !((selection != NULL) && (modest_text_utils_validate_recipient (selection, NULL))); } @@ -2089,8 +2190,7 @@ _selected_folder_is_same_as_source (ModestWindow *win) } /* Check source folder */ - result = modest_email_clipboard_check_source_folder (clipboard, - (const TnyFolder *) folder); + result = modest_email_clipboard_check_source_folder (clipboard, TNY_FOLDER (folder)); /* Free */ frees: @@ -2141,7 +2241,8 @@ _selected_folder_is_any_of_type (ModestWindow *win, /* free */ - g_object_unref (folder); + if (folder) + g_object_unref (folder); return result; } @@ -2159,7 +2260,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]; @@ -2207,22 +2310,40 @@ _invalid_clipboard_selected (ModestWindow *win, } result = !has_selection; } else if (MODEST_IS_MSG_VIEW_WINDOW (win)) { - GtkClipboard *clipboard = NULL; - gchar *selection = NULL; - - /* Get clipboard selection*/ - clipboard = gtk_clipboard_get (GDK_SELECTION_PRIMARY); - selection = gtk_clipboard_wait_for_text (clipboard); - - /* Check dimming */ - result = ((selection == NULL) || - (MODEST_IS_ATTACHMENTS_VIEW (focused))); + if (focused) { + MODEST_DEBUG_BLOCK (g_message ("FOCUSED %s", g_type_name (G_TYPE_FROM_INSTANCE (focused)));); + if (GTK_IS_LABEL (focused) && + !gtk_label_get_selection_bounds (GTK_LABEL (focused), NULL, NULL)) { + result = TRUE; + } else if (GTK_IS_TEXT_VIEW (focused)) { + GtkTextBuffer *buffer; + buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (focused)); + result = !gtk_text_buffer_get_has_selection (buffer); + } else if (GTK_IS_HTML (focused)) { + const gchar *sel; + int len = -1; + sel = gtk_html_get_selection_html (GTK_HTML (focused), &len); + result = ((sel == NULL) || (sel[0] == '\0')); + } else if (MODEST_IS_ATTACHMENTS_VIEW (focused)) { + result = TRUE; + } else { + GtkClipboard *clipboard; + gchar *selection; + + clipboard = gtk_clipboard_get (GDK_SELECTION_PRIMARY); + /* Get clipboard selection*/ + selection = gtk_clipboard_wait_for_text (clipboard); + /* Check dimming */ + result = (selection == NULL); + g_free (selection); + } + } else { + result = TRUE; + } if (result) modest_dimming_rule_set_notification (rule, ""); - if (selection != NULL) - g_free(selection); } else if (MODEST_IS_MAIN_WINDOW (win)) { /* Check dimming */ @@ -2242,7 +2363,7 @@ _invalid_attach_selected (ModestWindow *win, gboolean for_remove, ModestDimmingRule *rule) { - GList *attachments, *node; + TnyList *attachments; gint n_selected; TnyHeaderFlags flags; gboolean nested_attachments = FALSE; @@ -2262,7 +2383,7 @@ _invalid_attach_selected (ModestWindow *win, /* Get selected atachments */ attachments = modest_msg_view_window_get_attachments (MODEST_MSG_VIEW_WINDOW(win)); - n_selected = g_list_length (attachments); + n_selected = tny_list_get_length (attachments); /* Check unique */ if (!result) { @@ -2275,8 +2396,10 @@ _invalid_attach_selected (ModestWindow *win, /* Check attached type (view operation not required) */ if (!result && !for_view) { - for (node = attachments; node != NULL && !result; node = g_list_next (node)) { - TnyMimePart *mime_part = TNY_MIME_PART (node->data); + TnyIterator *iter; + iter = tny_list_create_iterator (attachments); + 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)) { selected_messages = TRUE; @@ -2288,7 +2411,10 @@ _invalid_attach_selected (ModestWindow *win, result = TRUE; } g_object_unref (nested_list); + g_object_unref (mime_part); + tny_iterator_next (iter); } + g_object_unref (iter); } /* Set notifications */ @@ -2305,7 +2431,7 @@ _invalid_attach_selected (ModestWindow *win, } /* Free */ - g_list_free (attachments); + g_object_unref (attachments); } return result; @@ -2314,7 +2440,8 @@ _invalid_attach_selected (ModestWindow *win, static gboolean _purged_attach_selected (ModestWindow *win, gboolean all, ModestDimmingRule *rule) { - GList *attachments = NULL, *node; + TnyList *attachments = NULL; + TnyIterator *iter; gint purged = 0; gint n_attachments = 0; gboolean result = FALSE; @@ -2334,24 +2461,35 @@ _purged_attach_selected (ModestWindow *win, gboolean all, ModestDimmingRule *rul if (attachments == NULL) return FALSE; - for (node = attachments; node != NULL; node = g_list_next (node)) { - TnyMimePart *mime_part = TNY_MIME_PART (node->data); + if (tny_list_get_length (attachments)) { + g_object_unref (attachments); + return FALSE; + } + + iter = tny_list_create_iterator (attachments); + while (!tny_iterator_is_done (iter)) { + TnyMimePart *mime_part = TNY_MIME_PART (tny_iterator_get_current (iter)); if (tny_mime_part_is_purged (mime_part)) { purged++; } n_attachments++; + g_object_unref (mime_part); + tny_iterator_next (iter); } + g_object_unref (iter); /* Free */ - g_list_free (attachments); + g_object_unref (attachments); if (all) result = (purged == n_attachments); 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; } @@ -2458,23 +2596,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; @@ -2482,14 +2606,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); @@ -2521,7 +2645,7 @@ _invalid_folder_for_purge (ModestWindow *win, /* If it's POP then dim */ if (modest_protocol_info_get_transport_store_protocol (proto_str) == MODEST_PROTOCOL_STORE_POP) { - GList *attachments = NULL; + TnyList *attachments = NULL; gint n_selected = 0; result = TRUE; @@ -2529,8 +2653,8 @@ _invalid_folder_for_purge (ModestWindow *win, * murrayc */ if (MODEST_IS_MSG_VIEW_WINDOW (win)) { attachments = modest_msg_view_window_get_attachments (MODEST_MSG_VIEW_WINDOW(win)); - n_selected = g_list_length (attachments); - g_list_free (attachments); + n_selected = tny_list_get_length (attachments); + g_object_unref (attachments); } modest_dimming_rule_set_notification (rule, @@ -2593,9 +2717,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) @@ -2623,3 +2747,15 @@ modest_ui_dimming_rules_on_save_to_drafts (ModestWindow *win, return dimmed; } + +gboolean +modest_ui_dimming_rules_on_insert_image (ModestWindow *win, + gpointer user_data) +{ + g_return_val_if_fail (MODEST_MSG_EDIT_WINDOW (win), FALSE); + + ModestMsgEditFormat format = + modest_msg_edit_window_get_format (MODEST_MSG_EDIT_WINDOW (win)); + + return (format != MODEST_MSG_EDIT_FORMAT_HTML); +}