X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-ui-dimming-rules.c;h=c5ec36b9b2549dee5913c17d42d6f18f876f5b65;hb=fcda0cb59d66b903b0c1364a451a377b56202a7b;hp=5229f5c88663d8128d3eb45f7fd1de6d8a8efe96;hpb=acb49abcabb4f4104693a02d6b5814a3f50ab036;p=modest diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c index 5229f5c..c5ec36b 100644 --- a/src/modest-ui-dimming-rules.c +++ b/src/modest-ui-dimming-rules.c @@ -625,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) @@ -725,17 +726,9 @@ modest_ui_dimming_rules_on_delete_msg (ModestWindow *win, gpointer user_data) dimmed = _invalid_msg_selected (MODEST_MAIN_WINDOW(win), FALSE, user_data); } if (!dimmed) { - dimmed = (state->already_opened_msg > 0) ? TRUE : FALSE; - if (dimmed) { - gchar *num = NULL, *message = NULL; - - num = g_strdup_printf ("%d", state->already_opened_msg); - message = g_strdup_printf(_("mcen_nc_unable_to_delete_n_messages"), num); - modest_dimming_rule_set_notification (rule, message); - g_free(num); - g_free(message); - } - + dimmed = state->sent_in_progress; + if (dimmed) + modest_dimming_rule_set_notification (rule, _CS("ckct_ib_unable_to_delete")); } if (!dimmed) { dimmed = state->any_marked_as_deleted; @@ -746,9 +739,16 @@ modest_ui_dimming_rules_on_delete_msg (ModestWindow *win, gpointer user_data) } } if (!dimmed) { - dimmed = state->sent_in_progress; - if (dimmed) - modest_dimming_rule_set_notification (rule, _CS("ckct_ib_unable_to_delete")); + dimmed = (state->already_opened_msg > 0) ? TRUE : FALSE; + if (dimmed) { + gchar *message = NULL; + + message = g_strdup_printf(_("mcen_nc_unable_to_delete_n_messages"), + state->already_opened_msg); + modest_dimming_rule_set_notification (rule, message); + g_free(message); + } + } } else if (MODEST_IS_MSG_VIEW_WINDOW (win)) { @@ -1242,6 +1242,8 @@ modest_ui_dimming_rules_on_remove_attachments (ModestWindow *win, gpointer user_ /* 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 */ @@ -1588,8 +1590,7 @@ modest_ui_dimming_rules_on_send (ModestWindow *win, gpointer user_data) body_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (body_field)); subject = gtk_entry_get_text (GTK_ENTRY (subject_field)); - dimmed = ((subject == NULL || subject[0] == '\0') - || (gtk_text_buffer_get_char_count(body_buffer) == 0)); + dimmed = (subject == NULL || subject[0] == '\0'); if (dimmed) modest_dimming_rule_set_notification (rule, _("mcen_ib_subject_or_body_not_modified")); } @@ -1808,14 +1809,7 @@ modest_ui_dimming_rules_on_add_to_contacts (ModestWindow *win, gpointer user_dat selection = gtk_text_buffer_get_text (buffer, &start, &end, FALSE); } } else if (GTK_IS_LABEL (focused)) { - gint start, end; - if (gtk_label_get_selection_bounds (GTK_LABEL (focused), &start, &end)) { - const gchar *start_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); - } + selection = modest_text_utils_label_get_selection (GTK_LABEL (focused)); } else { gboolean do_check = TRUE; GtkClipboard *clipboard; @@ -2247,7 +2241,8 @@ _selected_folder_is_any_of_type (ModestWindow *win, /* free */ - g_object_unref (folder); + if (folder) + g_object_unref (folder); return result; } @@ -2309,7 +2304,7 @@ _invalid_clipboard_selected (ModestWindow *win, if (GTK_IS_TEXT_VIEW (focused)) { GtkTextBuffer *buffer = NULL; buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (focused)); - has_selection = gtk_text_buffer_get_has_selection (GTK_TEXT_BUFFER (buffer)); + has_selection = modest_text_utils_buffer_selection_is_valid (buffer); } else if (GTK_IS_EDITABLE (focused)) { has_selection = gtk_editable_get_selection_bounds (GTK_EDITABLE (focused), NULL, NULL); } @@ -2616,7 +2611,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)) { @@ -2641,31 +2636,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)); } }