X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-ui-dimming-rules.c;h=486ef45ffa44c315cdf20d821a400c960e7e4b84;hb=77b84ab341b3d782ffcf80a344929f4090607c20;hp=a583675aff34303e8061d5563745d665b180ca42;hpb=465b819f8c27854f3bd8e4a4fbf0a026e6bf02ef;p=modest diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c index a583675..486ef45 100644 --- a/src/modest-ui-dimming-rules.c +++ b/src/modest-ui-dimming-rules.c @@ -78,7 +78,8 @@ modest_ui_dimming_rules_on_new_msg (ModestWindow *win, gpointer user_data) /* Check dimmed rule */ if (!dimmed) { - dimmed = _msg_download_in_progress (MODEST_MSG_VIEW_WINDOW(win)); + if (MODEST_IS_MSG_VIEW_WINDOW (win)) + dimmed = _msg_download_in_progress (MODEST_MSG_VIEW_WINDOW(win)); if (dimmed) modest_dimming_rule_set_notification (rule, ""); } @@ -264,8 +265,7 @@ modest_ui_dimming_rules_on_sort (ModestWindow *win, gpointer user_data) /* Check dimmed rule */ if (!dimmed) { dimmed = _selected_folder_is_root (MODEST_MAIN_WINDOW(win)); - if (dimmed) - modest_dimming_rule_set_notification (rule, ""); + modest_dimming_rule_set_notification (rule, NULL); } return dimmed; @@ -376,9 +376,10 @@ modest_ui_dimming_rules_on_reply_msg (ModestWindow *win, gpointer user_data) modest_dimming_rule_set_notification (rule, _("mail_ib_notavailable_downloading")); } if (!dimmed) { - dimmed = _msg_download_in_progress (MODEST_MSG_VIEW_WINDOW(win)); + if (MODEST_IS_MSG_VIEW_WINDOW (win)) + dimmed = _msg_download_in_progress (MODEST_MSG_VIEW_WINDOW (win)); if (dimmed) - modest_dimming_rule_set_notification (rule, ""); + modest_dimming_rule_set_notification (rule, _("mcen_ib_unable_to_reply")); } } @@ -462,7 +463,7 @@ modest_ui_dimming_rules_on_delete_msg (ModestWindow *win, gpointer user_data) if (!dimmed) { dimmed = _selected_msg_sent_in_progress (win); if (dimmed) - modest_dimming_rule_set_notification (rule, _("ckct_ib_unable_to_delete]")); + modest_dimming_rule_set_notification (rule, _("ckct_ib_unable_to_delete")); } } else if (MODEST_IS_MSG_VIEW_WINDOW (win)) { @@ -472,14 +473,14 @@ modest_ui_dimming_rules_on_delete_msg (ModestWindow *win, gpointer user_data) modest_dimming_rule_set_notification (rule, _("mail_ib_notavailable_downloading")); } if (!dimmed) { + dimmed = _marked_as_deleted (win); + if (dimmed) + modest_dimming_rule_set_notification (rule, _("mcen_ib_message_already_deleted")); + } + if (!dimmed) { dimmed = !modest_msg_view_window_has_headers_model (MODEST_MSG_VIEW_WINDOW(win)); if (dimmed) { - gchar *num = g_strdup("1"); - gchar *message = g_strdup_printf(_("mcen_nc_unable_to_delete_n_messages"), num); -/* modest_dimming_rule_set_notification (rule, _("mcen_nc_unable_to_delete_n_messages")); */ - modest_dimming_rule_set_notification (rule, message); - g_free(message); - g_free(num); + modest_dimming_rule_set_notification (rule, _("ckct_ib_unable_to_delete")); } } } @@ -538,7 +539,8 @@ modest_ui_dimming_rules_on_details (ModestWindow *win, gpointer user_data) /* Check dimmed rule */ if (!dimmed) { - dimmed = _msg_download_in_progress (MODEST_MSG_VIEW_WINDOW(win)); + if (MODEST_IS_MSG_VIEW_WINDOW (win)) + dimmed = _msg_download_in_progress (MODEST_MSG_VIEW_WINDOW (win)); if (dimmed) modest_dimming_rule_set_notification (rule, ""); } @@ -673,7 +675,8 @@ modest_ui_dimming_rules_on_view_window_move_to (ModestWindow *win, gpointer user modest_dimming_rule_set_notification (rule, _("mail_ib_notavailable_downloading")); } if (!dimmed) { - dimmed = !modest_msg_view_window_has_headers_model (MODEST_MSG_VIEW_WINDOW(win)); + if (MODEST_IS_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, _("mcen_ib_unable_to_move_mail_attachment")); } @@ -960,9 +963,9 @@ modest_ui_dimming_rules_on_view_previous (ModestWindow *win, gpointer user_data) modest_dimming_rule_set_notification (rule, _("mail_ib_notavailable_downloading")); } if (!dimmed) { - dimmed = modest_msg_view_window_first_message_selected (MODEST_MSG_VIEW_WINDOW(win)); -/* if (dimmed) */ -/* modest_dimming_rule_set_notification (rule, ""); */ + if (MODEST_IS_MSG_VIEW_WINDOW (win)) + dimmed = modest_msg_view_window_first_message_selected (MODEST_MSG_VIEW_WINDOW(win)); + modest_dimming_rule_set_notification (rule, NULL); } return dimmed; @@ -985,9 +988,9 @@ modest_ui_dimming_rules_on_view_next (ModestWindow *win, gpointer user_data) modest_dimming_rule_set_notification (rule, _("mail_ib_notavailable_downloading")); } if (!dimmed) { - dimmed = modest_msg_view_window_last_message_selected (MODEST_MSG_VIEW_WINDOW(win)); -/* if (dimmed) */ -/* modest_dimming_rule_set_notification (rule, ""); */ + if (MODEST_IS_MSG_VIEW_WINDOW (win)) + dimmed = modest_msg_view_window_last_message_selected (MODEST_MSG_VIEW_WINDOW (win)); + modest_dimming_rule_set_notification (rule, NULL); } return dimmed; @@ -1087,8 +1090,6 @@ _marked_as_deleted (ModestWindow *win) gboolean result = FALSE; TnyHeaderFlags flags; - g_return_val_if_fail (MODEST_IS_MAIN_WINDOW(win), FALSE); - flags = TNY_HEADER_FLAG_DELETED; /* Check dimmed rule */ @@ -1163,6 +1164,24 @@ _selected_folder_is_root (ModestMainWindow *win) g_return_val_if_fail (MODEST_IS_MAIN_WINDOW(win), FALSE); + /* All accounts are root items: */ + GtkWidget *folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(win), + MODEST_WIDGET_TYPE_FOLDER_VIEW); + if (folder_view) { + gboolean is_account = FALSE; + TnyFolderStore *folder_store = + modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view)); + if (folder_store) { + is_account = TNY_IS_ACCOUNT (folder_store); + g_object_unref (folder_store); + folder_store = NULL; + } + + if (is_account) + return TRUE; + } + + /* Try something more precise: */ types[0] = TNY_FOLDER_TYPE_ROOT; /* Check folder type */ @@ -1297,7 +1316,7 @@ _selected_folder_is_any_of_type (ModestWindow *win, guint i=0; gboolean result = FALSE; - /*Get curent folder */ + /*Get current folder */ if (MODEST_IS_MAIN_WINDOW(win)) { /* Get folder view */ @@ -1345,11 +1364,8 @@ _folder_is_any_of_type (TnyFolder *folder, g_return_val_if_fail (TNY_IS_FOLDER(folder), FALSE); /* Get folder type */ - if (modest_tny_folder_is_local_folder (folder)) - folder_type = modest_tny_folder_get_local_folder_type (folder); - else - folder_type = modest_tny_folder_guess_folder_type (folder); - + folder_type = modest_tny_folder_guess_folder_type (folder); + /* Check foler type */ for (i=0; i < ntypes; i++) { result = result || folder_type == types[i]; @@ -1673,6 +1689,7 @@ _selected_msg_marked_as (ModestWindow *win, TnyHeaderFlags mask, gboolean opposite) { + ModestWindow *main_window = NULL; GtkWidget *header_view = NULL; TnyList *selected_headers = NULL; TnyIterator *iter = NULL; @@ -1680,8 +1697,16 @@ _selected_msg_marked_as (ModestWindow *win, TnyHeaderFlags flags; gboolean result = FALSE; + if (MODEST_IS_MAIN_WINDOW (win)) + main_window = win; + else { + main_window = + modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ()); + } + + /* Get header view to check selected messages */ - header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(win), + header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(main_window), MODEST_WIDGET_TYPE_HEADER_VIEW); /* Check no selection */ @@ -1873,10 +1898,10 @@ _invalid_folder_for_purge (ModestWindow *win, /* Get folder and account of message */ 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); + folder = tny_msg_get_folder (msg); if (folder == NULL) { modest_dimming_rule_set_notification (rule, _("mail_ib_unable_to_purge_attachments")); - goto frees; + goto frees; } g_object_unref (msg); } else if (MODEST_IS_MAIN_WINDOW (win)) { @@ -1886,9 +1911,7 @@ _invalid_folder_for_purge (ModestWindow *win, return FALSE; folder = TNY_FOLDER (modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view))); if (folder == NULL || ! TNY_IS_FOLDER (folder)) - return FALSE; - g_object_ref (folder); - + goto frees; } else { g_return_val_if_reached (FALSE); } @@ -1914,12 +1937,17 @@ _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; - gint n_selected; + GList *attachments = NULL; + gint n_selected = 0; result = TRUE; - attachments = modest_msg_view_window_get_attachments (MODEST_MSG_VIEW_WINDOW(win)); - n_selected = g_list_length (attachments); - g_list_free (attachments); + + /* 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 = g_list_length (attachments); + g_list_free (attachments); + } modest_dimming_rule_set_notification (rule, ngettext ("mail_ib_unable_to_pure_attach_pop_mail_singular",