X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-ui-dimming-rules.c;h=d72d3ccc328f53ee7884982db92f24576d443125;hp=8d58b9cbe078d80fd8fcf7d0768bd8a5f8f20ded;hb=03cea934ab725b777fa4ce22917b069e2f219c3d;hpb=b4a9d53a84ceabe61e58b4b608434f0dd09c7eca diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c index 8d58b9c..d72d3cc 100644 --- a/src/modest-ui-dimming-rules.c +++ b/src/modest-ui-dimming-rules.c @@ -33,6 +33,7 @@ #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" @@ -319,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) { @@ -372,6 +372,9 @@ modest_ui_dimming_rules_on_new_folder (ModestWindow *win, gpointer user_data) /* 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; @@ -597,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); @@ -619,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) @@ -734,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) { @@ -751,8 +760,11 @@ 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")); + 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; @@ -947,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; @@ -960,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")); } } @@ -973,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); } @@ -1345,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")); } } } @@ -1512,9 +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) && - !gtk_clipboard_wait_is_text_available(gtk_clipboard_get(GDK_SELECTION_CLIPBOARD)); + ((clipboard_text == NULL) || (clipboard_text[0] == '\0')); } return dimmed; @@ -1533,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 ( @@ -1542,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; @@ -1799,17 +1812,20 @@ modest_ui_dimming_rules_on_add_to_contacts (ModestWindow *win, gpointer user_dat gint start, end; if (gtk_label_get_selection_bounds (GTK_LABEL (focused), &start, &end)) { const gchar *start_offset; + const gchar *end_offset; start_offset = gtk_label_get_text (GTK_LABEL (focused)); start_offset = g_utf8_offset_to_pointer (start_offset, start); - selection = g_new0 (gchar, end - start + 1); - g_utf8_strncpy (selection, start_offset, end - start); + end_offset = gtk_label_get_text (GTK_LABEL (focused)); + end_offset = g_utf8_offset_to_pointer (end_offset, end); + selection = g_strndup (start_offset, end_offset - start_offset); + g_message (selection); } } else { gboolean do_check = TRUE; GtkClipboard *clipboard; if (GTK_IS_HTML (focused)) { const gchar *sel; - guint len = -1; + int len = -1; sel = gtk_html_get_selection_html (GTK_HTML (focused), &len); do_check = !((sel == NULL) || (sel[0] == '\0')); } @@ -2314,7 +2330,7 @@ _invalid_clipboard_selected (ModestWindow *win, result = !gtk_text_buffer_get_has_selection (buffer); } else if (GTK_IS_HTML (focused)) { const gchar *sel; - guint len = -1; + 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)) { @@ -2356,7 +2372,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; @@ -2376,7 +2392,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) { @@ -2389,8 +2405,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; @@ -2402,7 +2420,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 */ @@ -2419,7 +2440,7 @@ _invalid_attach_selected (ModestWindow *win, } /* Free */ - g_list_free (attachments); + g_object_unref (attachments); } return result; @@ -2428,7 +2449,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; @@ -2448,16 +2470,25 @@ _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); @@ -2623,7 +2654,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; @@ -2631,8 +2662,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,