X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-msg-view-window.c;h=ded5e351b4c0bbc62f6f82710f41bef8a8ab4686;hp=13e59a8acb7b053d189cbc6db8a19f1fa5edd9fb;hb=21b666ae007ad3d154fb0a081a43404529f57896;hpb=1454004bf3c64e8c09736d56f87b8ba46f1357e1 diff --git a/src/maemo/modest-msg-view-window.c b/src/maemo/modest-msg-view-window.c index 13e59a8..ded5e35 100644 --- a/src/maemo/modest-msg-view-window.c +++ b/src/maemo/modest-msg-view-window.c @@ -30,7 +30,8 @@ #include #include #include -#include +#include +#include #include #include "modest-platform.h" #include @@ -101,7 +102,6 @@ static void set_toolbar_mode (ModestMsgViewWindow *self, static gboolean set_toolbar_transfer_mode (ModestMsgViewWindow *self); - static void update_window_title (ModestMsgViewWindow *window); @@ -273,7 +273,7 @@ set_toolbar_mode (ModestMsgViewWindow *self, { ModestWindowPrivate *parent_priv; ModestMsgViewWindowPrivate *priv; - GtkAction *widget = NULL; +/* GtkWidget *widget = NULL; */ g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (self)); @@ -283,18 +283,19 @@ set_toolbar_mode (ModestMsgViewWindow *self, /* Sets current toolbar mode */ priv->current_toolbar_mode = mode; + /* Update toolbar dimming state */ + modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (self)); + switch (mode) { - case TOOLBAR_MODE_NORMAL: - widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarMessageNew"); - gtk_action_set_sensitive (widget, TRUE); - widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarMessageReply"); - gtk_action_set_sensitive (widget, TRUE); - widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarDeleteMessage"); - gtk_action_set_sensitive (widget, TRUE); - widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarMessageMoveTo"); - gtk_action_set_sensitive (widget, TRUE); - widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/FindInMessage"); - gtk_action_set_sensitive (widget, TRUE); + case TOOLBAR_MODE_NORMAL: +/* widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarMessageReply"); */ +/* gtk_action_set_sensitive (widget, TRUE); */ +/* widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarDeleteMessage"); */ +/* gtk_action_set_sensitive (widget, TRUE); */ +/* widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarMessageMoveTo"); */ +/* gtk_action_set_sensitive (widget, TRUE); */ +/* widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/FindInMessage"); */ +/* gtk_action_set_sensitive (widget, TRUE); */ if (priv->prev_toolitem) gtk_widget_show (priv->prev_toolitem); @@ -318,16 +319,14 @@ set_toolbar_mode (ModestMsgViewWindow *self, break; case TOOLBAR_MODE_TRANSFER: - widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarMessageNew"); - gtk_action_set_sensitive (widget, FALSE); - widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarMessageReply"); - gtk_action_set_sensitive (widget, FALSE); - widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarDeleteMessage"); - gtk_action_set_sensitive (widget, FALSE); - widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarMessageMoveTo"); - gtk_action_set_sensitive (widget, FALSE); - widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/FindInMessage"); - gtk_action_set_sensitive (widget, FALSE); +/* widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarMessageReply"); */ +/* gtk_action_set_sensitive (widget, FALSE); */ +/* widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarDeleteMessage"); */ +/* gtk_action_set_sensitive (widget, FALSE); */ +/* widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarMessageMoveTo"); */ +/* gtk_action_set_sensitive (widget, FALSE); */ +/* widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/FindInMessage"); */ +/* gtk_action_set_sensitive (widget, FALSE); */ if (priv->prev_toolitem) gtk_widget_hide (priv->prev_toolitem); @@ -462,12 +461,12 @@ modest_msg_view_window_finalize (GObject *obj) -static gboolean -on_delete_event (GtkWidget *widget, GdkEvent *event, ModestMsgViewWindow *self) -{ - modest_window_save_state (MODEST_WINDOW (self)); - return FALSE; -} +/* static gboolean */ +/* on_delete_event (GtkWidget *widget, GdkEvent *event, ModestMsgViewWindow *self) */ +/* { */ +/* modest_window_save_state (MODEST_WINDOW (self)); */ +/* return FALSE; */ +/* } */ ModestWindow * modest_msg_view_window_new_with_header_model (TnyMsg *msg, @@ -510,7 +509,6 @@ modest_msg_view_window_new (TnyMsg *msg, ModestDimmingRulesGroup *toolbar_rules_group = NULL; GtkActionGroup *action_group = NULL; GError *error = NULL; - GdkPixbuf *window_icon = NULL; g_return_val_if_fail (msg, NULL); @@ -587,7 +585,7 @@ modest_msg_view_window_new (TnyMsg *msg, init_window (MODEST_MSG_VIEW_WINDOW(obj), msg); restore_settings (MODEST_MSG_VIEW_WINDOW(obj)); - g_signal_connect (G_OBJECT(obj), "delete-event", G_CALLBACK(on_delete_event), obj); +/* g_signal_connect (G_OBJECT(obj), "delete-event", G_CALLBACK(on_delete_event), obj); */ g_signal_connect (G_OBJECT(priv->msg_view), "link_clicked", G_CALLBACK (modest_ui_actions_on_msg_link_clicked), obj); @@ -618,16 +616,14 @@ modest_msg_view_window_new (TnyMsg *msg, priv->last_search = NULL; - - /* Set window icon */ - window_icon = modest_platform_get_icon (MODEST_APP_MSG_VIEW_ICON); - gtk_window_set_icon (GTK_WINDOW (obj), window_icon); - /* Init the clipboard actions dim status */ modest_msg_view_grab_focus(MODEST_MSG_VIEW (priv->msg_view)); update_window_title (MODEST_MSG_VIEW_WINDOW (obj)); + /* Check toolbar dimming rules */ + modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (obj)); + return MODEST_WINDOW(obj); } @@ -647,22 +643,35 @@ TnyHeader* modest_msg_view_window_get_header (ModestMsgViewWindow *self) { ModestMsgViewWindowPrivate *priv= NULL; + TnyMsg *msg = NULL; TnyHeader *header = NULL; + GtkTreePath *path = NULL; GtkTreeIter iter; 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 (priv->header_model == NULL) { + msg = modest_msg_view_window_get_message (self); + header = tny_msg_get_header (msg); + g_object_unref (msg); + return header; + } + /* Get current message iter */ + 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, &iter, - gtk_tree_row_reference_get_path (priv->row_reference)); + path); /* Get current message header */ gtk_tree_model_get (priv->header_model, &iter, TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, &header, -1); + gtk_tree_path_free (path); return header; } @@ -684,7 +693,12 @@ modest_msg_view_window_get_message (ModestMsgViewWindow *self) const gchar* modest_msg_view_window_get_message_uid (ModestMsgViewWindow *self) { - ModestMsgViewWindowPrivate *priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (self); + ModestMsgViewWindowPrivate *priv; + + g_return_val_if_fail (self, NULL); + + priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (self); + return (const gchar*) priv->msg_uid; } @@ -891,18 +905,20 @@ static void modest_msg_view_window_scroll_up (ModestWindow *window) { ModestMsgViewWindowPrivate *priv; + gboolean return_value; priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window); - g_signal_emit_by_name (G_OBJECT (priv->main_scroll), "scroll-child", GTK_SCROLL_STEP_UP, FALSE); + g_signal_emit_by_name (G_OBJECT (priv->main_scroll), "scroll-child", GTK_SCROLL_STEP_UP, FALSE, &return_value); } static void modest_msg_view_window_scroll_down (ModestWindow *window) { ModestMsgViewWindowPrivate *priv; + gboolean return_value; priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window); - g_signal_emit_by_name (G_OBJECT (priv->main_scroll), "scroll-child", GTK_SCROLL_STEP_DOWN, FALSE); + g_signal_emit_by_name (G_OBJECT (priv->main_scroll), "scroll-child", GTK_SCROLL_STEP_DOWN, FALSE, &return_value); } gboolean @@ -918,8 +934,7 @@ modest_msg_view_window_last_message_selected (ModestMsgViewWindow *window) if (priv->header_model) { path = gtk_tree_row_reference_get_path (priv->row_reference); - if (!path) - return TRUE; + if (path == NULL) return FALSE; while (!has_next) { TnyHeader *header; gtk_tree_path_next (path); @@ -930,9 +945,9 @@ modest_msg_view_window_last_message_selected (ModestMsgViewWindow *window) if (!(tny_header_get_flags(header)&TNY_HEADER_FLAG_DELETED)) { has_next = TRUE; break; - } - + } } + gtk_tree_path_free (path); return !has_next; } else { return TRUE; @@ -997,6 +1012,7 @@ modest_msg_view_window_first_message_selected (ModestMsgViewWindow *window) } g_free (path_string); } + gtk_tree_path_free (path); return result; } else { return TRUE; @@ -1004,57 +1020,119 @@ modest_msg_view_window_first_message_selected (ModestMsgViewWindow *window) } +/** + * Reads the message whose summary item is @header. It takes care of + * several things, among others: + * + * If the message was not previously downloaded then ask the user + * before downloading. If there is no connection launch the connection + * dialog. Update toolbar dimming rules. + * + * Returns: TRUE if the mail operation was started, otherwise if the + * user do not want to download the message, or if the user do not + * want to connect, then the operation is not issued + **/ +static gboolean +message_reader (ModestMsgViewWindow *window, + ModestMsgViewWindowPrivate *priv, + TnyHeader *header, + GtkTreeIter iter) +{ + ModestMailOperation *mail_op = NULL; + GtkTreePath *path = NULL; + ModestMailOperationTypeOperation op_type; + + /* Msg download completed */ + if (tny_header_get_flags (header) & TNY_HEADER_FLAG_CACHED) { + op_type = MODEST_MAIL_OPERATION_TYPE_OPEN; + } else { + TnyFolder *folder; + GtkResponseType response; + + op_type = MODEST_MAIL_OPERATION_TYPE_RECEIVE; + + /* Ask the user if he wants to download the message */ + response = modest_platform_run_confirmation_dialog (GTK_WINDOW (window), + _("mcen_nc_get_msg")); + if (response == GTK_RESPONSE_CANCEL) + return FALSE; + + /* Offer the connection dialog if necessary */ + /* FIXME: should this stuff go directly to the mail + operation instead of spread it all over the + code? */ + folder = tny_header_get_folder (header); + if (folder) { + if (!modest_platform_connect_and_wait_if_network_folderstore (NULL, TNY_FOLDER_STORE (folder))) { + g_object_unref (folder); + return FALSE; + } + g_object_unref (folder); + } + } + + /* Get the path, will be freed by the callback */ + path = gtk_tree_model_get_path (priv->header_model, &iter); + + /* New mail operation */ + mail_op = modest_mail_operation_new_with_error_handling (op_type, + G_OBJECT(window), + modest_ui_actions_get_msgs_full_error_handler, + NULL); + + modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); + modest_mail_operation_get_msg (mail_op, header, view_msg_cb, path); + g_object_unref (mail_op); + + /* Update toolbar dimming rules */ + modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window)); + + return TRUE; +} + gboolean modest_msg_view_window_select_next_message (ModestMsgViewWindow *window) { - TnyHeaderFlags flags; - ModestMailOperation *mail_op = NULL; ModestMsgViewWindowPrivate *priv; + GtkTreePath *path= NULL; GtkTreeIter tmp_iter; g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window), FALSE); priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window); if (priv->header_model) { + path = gtk_tree_row_reference_get_path (priv->row_reference); + if (path == NULL) return FALSE; + gtk_tree_model_get_iter (priv->header_model, &tmp_iter, - gtk_tree_row_reference_get_path (priv->row_reference)); + path); while (gtk_tree_model_iter_next (priv->header_model, &tmp_iter)) { TnyHeader *header; - GtkTreePath *path; - gtk_tree_model_get (priv->header_model, &tmp_iter, TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, + gtk_tree_model_get (priv->header_model, &tmp_iter, + TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, &header, -1); if (!header) break; - if (tny_header_get_flags (header) & TNY_HEADER_FLAG_DELETED) - continue; - - /* Update the row reference */ - gtk_tree_row_reference_free (priv->row_reference); - path = gtk_tree_model_get_path (priv->header_model, &tmp_iter); - priv->row_reference = gtk_tree_row_reference_new (priv->header_model, path); - gtk_tree_path_free (path); - - /* Mark as read */ - flags = tny_header_get_flags (header); - if (!(flags & TNY_HEADER_FLAG_SEEN)) -/* tny_header_set_flags (header, flags | TNY_HEADER_FLAG_SEEN); */ - tny_header_set_flags (header, TNY_HEADER_FLAG_SEEN); - /* Msg download initied */ + if (tny_header_get_flags (header) & TNY_HEADER_FLAG_DELETED) { + g_object_unref (header); + continue; + } - /* New mail operation */ - mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, G_OBJECT(window)); - modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); - modest_mail_operation_get_msg (mail_op, header, view_msg_cb, NULL); - g_object_unref (mail_op); + /* Read the message & show it */ + if (!message_reader (window, priv, header, tmp_iter)) { + g_object_unref (header); + break; + } - /* Update toolbar dimming rules */ - modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window)); + /* Free */ + g_object_unref (header); return TRUE; } + gtk_tree_path_free (path); } return FALSE; } @@ -1063,10 +1141,7 @@ gboolean modest_msg_view_window_select_first_message (ModestMsgViewWindow *self) { ModestMsgViewWindowPrivate *priv = NULL; - ModestMailOperation *mail_op = NULL; TnyHeader *header = NULL; - TnyHeaderFlags flags; - GtkTreePath *path = NULL; GtkTreeIter iter; g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (self), FALSE); @@ -1088,26 +1163,8 @@ modest_msg_view_window_select_first_message (ModestMsgViewWindow *self) return modest_msg_view_window_select_next_message (self); } - /* Update the row reference */ - gtk_tree_row_reference_free (priv->row_reference); - path = gtk_tree_path_new_first (); - priv->row_reference = gtk_tree_row_reference_new (priv->header_model, path); - gtk_tree_path_free (path); - - /* Mark as read */ - flags = tny_header_get_flags (header); - if (!(flags & TNY_HEADER_FLAG_SEEN)) -/* tny_header_set_flags (header, flags | TNY_HEADER_FLAG_SEEN); */ - tny_header_set_flags (header, TNY_HEADER_FLAG_SEEN); - - /* New mail operation */ - mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, G_OBJECT(self)); - modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); - modest_mail_operation_get_msg (mail_op, header, view_msg_cb, NULL); - g_object_unref (mail_op); - - /* Update toolbar dimming rules */ - modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (self)); + /* Read the message & show it */ + message_reader (self, priv, header, iter); /* Free */ g_object_unref (header); @@ -1118,10 +1175,8 @@ modest_msg_view_window_select_first_message (ModestMsgViewWindow *self) gboolean modest_msg_view_window_select_previous_message (ModestMsgViewWindow *window) { - TnyHeaderFlags flags; ModestMsgViewWindowPrivate *priv = NULL; GtkTreePath *path; - ModestMailOperation *mail_op = NULL; g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window), FALSE); priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window); @@ -1146,29 +1201,18 @@ modest_msg_view_window_select_previous_message (ModestMsgViewWindow *window) continue; } - /* Update the row reference */ - gtk_tree_row_reference_free (priv->row_reference); - priv->row_reference = gtk_tree_row_reference_new (priv->header_model, path); - - /* Mark as read */ - flags = tny_header_get_flags (header); - if (!(flags & TNY_HEADER_FLAG_SEEN)) -/* tny_header_set_flags (header, flags | TNY_HEADER_FLAG_SEEN); */ - tny_header_set_flags (header, TNY_HEADER_FLAG_SEEN); - - /* New mail operation */ - mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, G_OBJECT(window)); - modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); - modest_mail_operation_get_msg (mail_op, header, view_msg_cb, NULL); - - /* Update toolbar dimming rules */ - modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window)); + /* Read the message & show it */ + if (!message_reader (window, priv, header, iter)) { + g_object_unref (header); + break; + } g_object_unref (header); return TRUE; } + gtk_tree_path_free (path); return FALSE; } @@ -1180,15 +1224,29 @@ view_msg_cb (ModestMailOperation *mail_op, { ModestMsgViewWindow *self = NULL; ModestMsgViewWindowPrivate *priv = NULL; + GtkTreePath *path; - g_return_if_fail (TNY_IS_MSG (msg)); + /* If there was any error */ + path = (GtkTreePath *) user_data; + if (!modest_ui_actions_msg_retrieval_check (mail_op, header, msg)) { + gtk_tree_path_free (path); + return; + } /* Get the window */ self = (ModestMsgViewWindow *) modest_mail_operation_get_source (mail_op); g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (self)); - priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (self); + /* Update the row reference */ + gtk_tree_row_reference_free (priv->row_reference); + priv->row_reference = gtk_tree_row_reference_new (priv->header_model, path); + gtk_tree_path_free (path); + + /* Mark header as read */ + if (!(tny_header_get_flags (header) & TNY_HEADER_FLAG_SEEN)) + tny_header_set_flags (header, TNY_HEADER_FLAG_SEEN); + /* Set new message */ modest_msg_view_set_message (MODEST_MSG_VIEW (priv->msg_view), msg); modest_msg_view_window_update_priority (self); @@ -1244,7 +1302,10 @@ modest_msg_view_window_update_priority (ModestMsgViewWindow *window) if (priv->header_model) { TnyHeader *header; GtkTreeIter iter; + GtkTreePath *path = NULL; + path = gtk_tree_row_reference_get_path (priv->row_reference); + g_return_if_fail (path != NULL); gtk_tree_model_get_iter (priv->header_model, &iter, gtk_tree_row_reference_get_path (priv->row_reference)); @@ -1252,6 +1313,7 @@ modest_msg_view_window_update_priority (ModestMsgViewWindow *window) gtk_tree_model_get (priv->header_model, &iter, TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, &header, -1); flags = tny_header_get_flags (header); + gtk_tree_path_free (path); } modest_msg_view_set_priority (MODEST_MSG_VIEW(priv->msg_view), flags); @@ -1375,6 +1437,7 @@ modest_msg_view_window_show_toolbar (ModestWindow *self, gtk_widget_show (GTK_WIDGET (parent_priv->toolbar)); set_toolbar_mode (MODEST_MSG_VIEW_WINDOW(self), TOOLBAR_MODE_NORMAL); + } else { gtk_widget_set_no_show_all (parent_priv->toolbar, TRUE); gtk_widget_hide (GTK_WIDGET (parent_priv->toolbar)); @@ -1395,7 +1458,7 @@ modest_msg_view_window_clipboard_owner_change (GtkClipboard *clipboard, parent_priv = MODEST_WINDOW_GET_PRIVATE (window); selection = gtk_clipboard_wait_for_text (clipboard); - is_address = ((selection != NULL) && (modest_text_utils_validate_recipient (selection))); + is_address = ((selection != NULL) && (modest_text_utils_validate_recipient (selection, NULL))); /* action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ToolsMenu/ToolsAddToContactsMenu"); */ /* gtk_action_set_sensitive (action, is_address); */ @@ -1413,6 +1476,17 @@ modest_msg_view_window_clipboard_owner_change (GtkClipboard *clipboard, } +gboolean +modest_msg_view_window_transfer_mode_enabled (ModestMsgViewWindow *self) +{ + ModestMsgViewWindowPrivate *priv; + + g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (self), FALSE); + priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(self); + + return priv->current_toolbar_mode == TOOLBAR_MODE_TRANSFER; +} + static void cancel_progressbar (GtkToolButton *toolbutton, ModestMsgViewWindow *self) @@ -1475,6 +1549,7 @@ on_queue_changed (ModestMailOperationQueue *queue, switch (op_type) { case MODEST_MAIL_OPERATION_TYPE_SEND: case MODEST_MAIL_OPERATION_TYPE_RECEIVE: + case MODEST_MAIL_OPERATION_TYPE_OPEN: mode = TOOLBAR_MODE_TRANSFER; break; default: @@ -1559,6 +1634,12 @@ modest_msg_view_window_view_attachment (ModestMsgViewWindow *window, TnyMimePart g_object_ref (mime_part); } + if (tny_mime_part_is_purged (mime_part)) { + g_object_unref (mime_part); + hildon_banner_show_information (NULL, NULL, _("mail_ib_attach_not_local")); + return; + } + if (!TNY_IS_MSG (mime_part)) { gchar *filepath = NULL; const gchar *att_filename = tny_mime_part_get_filename (mime_part); @@ -1588,21 +1669,30 @@ modest_msg_view_window_view_attachment (ModestMsgViewWindow *window, TnyMimePart TnyHeader *header = NULL; ModestWindowMgr *mgr; ModestWindow *msg_win = NULL; - + gboolean found; + header = tny_msg_get_header (TNY_MSG (mime_part)); - mgr = modest_runtime_get_window_mgr (); - msg_win = modest_window_mgr_find_window_by_header (mgr, header); - - if (!msg_win) { + mgr = modest_runtime_get_window_mgr (); + found = modest_window_mgr_find_registered_header (mgr, header, &msg_win); + + if (found) { + if (msg_win) /* there is already a window for this uid; top it */ + gtk_window_present (GTK_WINDOW(msg_win)); + else + /* if it's found, but there is no msg_win, it's probably in the process of being created; + * thus, we don't do anything */ + g_warning ("window for is already being created"); + } else { + /* it's not found, so create a new window for it */ + modest_window_mgr_register_header (mgr, header); /* register the uid before building the window */ gchar *account = g_strdup (modest_window_get_active_account (MODEST_WINDOW (window))); if (!account) account = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr ()); msg_win = modest_msg_view_window_new (TNY_MSG (mime_part), account, NULL); modest_window_mgr_register_window (mgr, msg_win); gtk_window_set_transient_for (GTK_WINDOW (msg_win), GTK_WINDOW (window)); + gtk_widget_show_all (GTK_WIDGET (msg_win)); } - - gtk_widget_show_all (GTK_WIDGET (msg_win)); } g_object_unref (mime_part); } @@ -1742,18 +1832,38 @@ modest_msg_view_window_save_attachments (ModestMsgViewWindow *window, GList *mim } void -modest_msg_view_window_remove_attachments (ModestMsgViewWindow *window) +modest_msg_view_window_remove_attachments (ModestMsgViewWindow *window, gboolean get_all) { ModestMsgViewWindowPrivate *priv; GList *mime_parts = NULL, *node; gchar *confirmation_message; gint response; gint n_attachments; + TnyMsg *msg; +/* TnyFolder *folder; */ g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window)); priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window); - mime_parts = modest_msg_view_get_selected_attachments (MODEST_MSG_VIEW (priv->msg_view)); + if (get_all) + mime_parts = modest_msg_view_get_attachments (MODEST_MSG_VIEW (priv->msg_view)); + else + mime_parts = modest_msg_view_get_selected_attachments (MODEST_MSG_VIEW (priv->msg_view)); + + /* Remove already purged messages from mime parts list */ + node = mime_parts; + while (node != NULL) { + TnyMimePart *part = TNY_MIME_PART (node->data); + if (tny_mime_part_is_purged (part)) { + GList *deleted_node = node; + node = g_list_next (node); + g_object_unref (part); + mime_parts = g_list_delete_link (mime_parts, deleted_node); + } else { + node = g_list_next (node); + } + } + if (mime_parts == NULL) return; @@ -1784,11 +1894,27 @@ modest_msg_view_window_remove_attachments (ModestMsgViewWindow *window) if (response != GTK_RESPONSE_OK) return; +/* folder = tny_msg_get_folder (msg); */ +/* tny_msg_uncache_attachments (msg); */ +/* tny_folder_refresh (folder, NULL); */ +/* g_object_unref (folder); */ + + modest_platform_information_banner (NULL, NULL, _("mcen_ib_removing_attachment")); + for (node = mime_parts; node != NULL; node = g_list_next (node)) { - modest_msg_view_remove_attachment (MODEST_MSG_VIEW (priv->msg_view), node->data); + tny_mime_part_set_purged (TNY_MIME_PART (node->data)); +/* modest_msg_view_remove_attachment (MODEST_MSG_VIEW (priv->msg_view), node->data); */ } + + msg = modest_msg_view_get_message (MODEST_MSG_VIEW (priv->msg_view)); + modest_msg_view_set_message (MODEST_MSG_VIEW (priv->msg_view), NULL); + tny_msg_rewrite_cache (msg); + modest_msg_view_set_message (MODEST_MSG_VIEW (priv->msg_view), msg); + g_list_foreach (mime_parts, (GFunc) g_object_unref, NULL); g_list_free (mime_parts); + + } @@ -1804,6 +1930,7 @@ update_window_title (ModestMsgViewWindow *window) if (msg != NULL) { header = tny_msg_get_header (msg); subject = tny_header_get_subject (header); + g_object_unref (msg); } if ((subject == NULL)||(subject[0] == '\0')) @@ -1811,4 +1938,3 @@ update_window_title (ModestMsgViewWindow *window) gtk_window_set_title (GTK_WINDOW (window), subject); } -