+2007-08-01 Murray Cumming <murrayc@murrayc.com>
+
+ * src/maemo/modest-msg-view-window.c:
+ (modest_msg_view_window_get_header),
+ (modest_msg_view_window_last_message_selected):
+ Added comments to explain the use of priv->header_model.
+ * src/modest-ui-dimming-rules.c:
+ (modest_ui_dimming_rules_on_open_msg),
+ (modest_ui_dimming_rules_on_mark_as_read_msg),
+ (modest_ui_dimming_rules_on_mark_as_unread_msg),
+ (modest_ui_dimming_rules_on_remove_attachments),
+ (_invalid_attach_selected), (_selected_msg_marked_as):
+ Renamed _marked_as_deleted() to _selected_message_is_marked_as_deleted(),
+ and changed the parameter to a ModestMainWindow to make it clearer that
+ it never uses any other kind of window.
+ Added _message_is_marked_as_deleted() for examining a ModestMsgViewWindow
+ instead of the selected message.
+ I notice that much of the dimming code and the ModestMsgViewWindow code
+ hard-codes the assumption that the viewed message is always selected in
+ the header view. This does not seem wise or simple.
+
+ (modest_ui_dimming_rules_on_delete_msg): For a ModestMsgViewWindow,
+ examine the actual message instead of whatever might be selected
+ in the header view. This stops the delete toolbar button and menu item
+ from being dimmed when opening a message view the search UI,
+ partially fixing projects.maemo.org bug NB#63811.
+
+ However, when actually deleting, I now get this warning:
+ "tny_header_set_flags: This is a header instance for a new message.
+ Only priority and attachment flags are supported"
+
2007-07-30 Johannes Schmid <johannes.schmid@openismus.com>
* src/modest-ui-actions.c: (modest_ui_actions_on_send):
/* Optimized view enabled */
gboolean optimized_view;
+ /* A reference to the @model of the header view
+ * to allow selecting previous/next messages,
+ * if the message is currently selected in the header view.
+ */
GtkTreeModel *header_model;
GtkTreeRowReference *row_reference;
GtkTreeRowReference *next_row_reference;
g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (self), NULL);
priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (self);
- /* Message is not obtained from a treemodel (Attachment ?) */
+ /* If the message ws not obtained from a treemodel,
+ * for instance if it was opened directly by the search UI:
+ */
if (priv->header_model == NULL) {
msg = modest_msg_view_window_get_message (self);
header = tny_msg_get_header (msg);
return header;
}
- /* Get current message iter */
+ /* Get iter of the currently selected message in the header view: */
+ /* TODO: Why not just give this window a ref of the TnyHeader or TnyMessage,
+ * instead of sometimes retrieving it from the header view?
+ * Then we wouldn't be dependent on the message actually still being selected
+ * in the header view. murrayc. */
path = gtk_tree_row_reference_get_path (priv->row_reference);
g_return_val_if_fail (path != NULL, NULL);
gtk_tree_model_get_iter (priv->header_model,
break;
gtk_tree_model_get (priv->header_model, &tmp_iter, TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN,
&header, -1);
- if (!(tny_header_get_flags(header)&TNY_HEADER_FLAG_DELETED)) {
+ if (!(tny_header_get_flags(header) & TNY_HEADER_FLAG_DELETED)) {
has_next = TRUE;
break;
}
static gboolean _clipboard_is_empty (ModestWindow *win);
static gboolean _invalid_clipboard_selected (ModestWindow *win, ModestDimmingRule *rule);
static gboolean _already_opened_msg (ModestWindow *win, guint *n_messages);
-static gboolean _selected_msg_marked_as (ModestWindow *win, TnyHeaderFlags mask, gboolean opposite, gboolean all);
+static gboolean _selected_msg_marked_as (ModestMainWindow *win, TnyHeaderFlags mask, gboolean opposite, gboolean all);
static gboolean _selected_folder_not_writeable (ModestMainWindow *win);
static gboolean _selected_folder_is_snd_level (ModestMainWindow *win);
static gboolean _selected_folder_is_any_of_type (ModestWindow *win, TnyFolderType types[], guint ntypes);
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 _marked_as_deleted (ModestWindow *win);
+static gboolean _message_is_marked_as_deleted (ModestMsgViewWindow *win);
+static gboolean _selected_message_is_marked_as_deleted (ModestMainWindow *win);
static gboolean _invalid_folder_for_purge (ModestWindow *win, ModestDimmingRule *rule);
static gboolean _transfer_mode_enabled (ModestWindow *win);
dimmed = _invalid_msg_selected (MODEST_MAIN_WINDOW(win), TRUE, user_data);
}
if (!dimmed) {
- dimmed = _marked_as_deleted (win);
+ dimmed = _selected_message_is_marked_as_deleted (MODEST_MAIN_WINDOW (win));
if (dimmed)
modest_dimming_rule_set_notification (rule, _("mcen_ib_message_already_deleted"));
}
}
}
if (!dimmed) {
- dimmed = _marked_as_deleted (win);
- if (dimmed)
+ dimmed = _selected_message_is_marked_as_deleted (MODEST_MAIN_WINDOW (win));
+ if (dimmed) {
modest_dimming_rule_set_notification (rule, _("mcen_ib_message_already_deleted"));
+ }
}
if (!dimmed) {
dimmed = _selected_msg_sent_in_progress (win);
modest_dimming_rule_set_notification (rule, _("mail_ib_notavailable_downloading"));
}
if (!dimmed) {
- dimmed = _marked_as_deleted (win);
+ dimmed = _message_is_marked_as_deleted (MODEST_MSG_VIEW_WINDOW (win));
if (dimmed)
modest_dimming_rule_set_notification (rule, _("mcen_ib_message_already_deleted"));
}
+
+ /* Commented out, because deletion should be possible even when
+ * the message window has no header view model, which will be the
+ * case when it is not the selected message in the header view.
+ */
+ /*
if (!dimmed) {
dimmed = !modest_msg_view_window_has_headers_model (MODEST_MSG_VIEW_WINDOW(win));
if (dimmed) {
modest_dimming_rule_set_notification (rule, _CS("ckct_ib_unable_to_delete"));
}
}
+ */
}
return dimmed;
dimmed = _invalid_msg_selected (MODEST_MAIN_WINDOW(win), FALSE, user_data);
}
if (!dimmed) {
- dimmed = _selected_msg_marked_as (win, flags, FALSE, TRUE);
+ dimmed = _selected_msg_marked_as (MODEST_MAIN_WINDOW(win), flags, FALSE, TRUE);
if (dimmed)
modest_dimming_rule_set_notification (rule, "");
}
if (!dimmed)
dimmed = _invalid_msg_selected (MODEST_MAIN_WINDOW(win), FALSE, user_data);
if (!dimmed) {
- dimmed = _selected_msg_marked_as (win, flags, TRUE, TRUE);
+ dimmed = _selected_msg_marked_as (MODEST_MAIN_WINDOW(win), flags, TRUE, TRUE);
if (dimmed)
modest_dimming_rule_set_notification (rule, "");
}
/* Check if the selected message in main window has attachments */
if (!dimmed && MODEST_IS_MAIN_WINDOW (win)) {
- dimmed = _selected_msg_marked_as (win, TNY_HEADER_FLAG_ATTACHMENTS, TRUE, FALSE);
+ dimmed = _selected_msg_marked_as (MODEST_MAIN_WINDOW(win), TNY_HEADER_FLAG_ATTACHMENTS, TRUE, FALSE);
if (dimmed)
modest_dimming_rule_set_notification (rule, _("mail_ib_unable_to_purge_attachments"));
}
/* *********************** static utility functions ******************** */
+/* Returns whether the selected message is marked as deleted. */
+static gboolean
+_message_is_marked_as_deleted (ModestMsgViewWindow *win)
+{
+ g_return_val_if_fail (win, FALSE);
+ g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW(win), FALSE);
+
+ TnyHeader* header = modest_msg_view_window_get_header (win);
+ if (!header)
+ return FALSE;
+
+ return (tny_header_get_flags (header) & TNY_HEADER_FLAG_DELETED);
+}
+
+
+
+/* Returns whether the selected message is marked as deleted.
+ * @param win The main window, or NULL if you want this function
+ * to discover the main window itself, which is marginally less
+ * efficient. */
static gboolean
-_marked_as_deleted (ModestWindow *win)
+_selected_message_is_marked_as_deleted (ModestMainWindow *win)
{
gboolean result = FALSE;
TnyHeaderFlags flags;
if (MODEST_IS_MAIN_WINDOW (win)) {
flags = TNY_HEADER_FLAG_ATTACHMENTS;
if (!result)
- result = _selected_msg_marked_as (win, flags, TRUE, FALSE);
+ result = _selected_msg_marked_as (MODEST_MAIN_WINDOW (win), flags, TRUE, FALSE);
}
else if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
return found;
}
+/* Returns whether the selected message has these flags.
+ * @win: The main window, or NULL if you want this function
+ * to discover the main window itself.
+ */
static gboolean
-_selected_msg_marked_as (ModestWindow *win,
+_selected_msg_marked_as (ModestMainWindow *win,
TnyHeaderFlags mask,
gboolean opposite,
gboolean all)
{
- ModestWindow *main_window = NULL;
+ ModestMainWindow *main_window = NULL;
GtkWidget *header_view = NULL;
TnyList *selected_headers = NULL;
TnyIterator *iter = NULL;
TnyHeaderFlags flags = 0;
gboolean result = TRUE;
- if (MODEST_IS_MAIN_WINDOW (win))
+ /* The caller can supply the main window if it knows it,
+ * to save time, or we can get it here: */
+ if (win && MODEST_IS_MAIN_WINDOW (win))
main_window = win;
- else
- main_window =
- modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ());
+ else {
+ main_window = MODEST_MAIN_WINDOW (
+ modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ()));
+ }
/* TODO: Javi, what about if the main window does not
exist?. Adding some code to avoid CRITICALs */