{
ModestWindowPrivate *parent_priv;
ModestMsgViewWindowPrivate *priv;
- GtkAction *widget = NULL;
+ GtkWidget *widget = NULL;
g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (self));
/* Sets current toolbar mode */
priv->current_toolbar_mode = mode;
+ /* Get toolbar widget */
+ widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar");
+
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:
+ gtk_widget_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); */
if (priv->prev_toolitem)
gtk_widget_show (priv->prev_toolitem);
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);
+ gtk_widget_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);
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);
}
modest_msg_view_window_get_header (ModestMsgViewWindow *self)
{
ModestMsgViewWindowPrivate *priv= NULL;
+ TnyMsg *msg = NULL;
TnyHeader *header = 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 */
gtk_tree_model_get_iter (priv->header_model,
&iter,
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;
/* 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 */
-
+ /* Msg download completed */
+ if (flags & TNY_HEADER_FLAG_CACHED)
+ mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_OPEN, G_OBJECT(window));
+ else
+ mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, G_OBJECT(window));
+
/* 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);
/* 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 completed */
+ if (flags & TNY_HEADER_FLAG_CACHED)
+ mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_OPEN, G_OBJECT(self));
+ else
+ mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, G_OBJECT(self));
+
/* 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);
/* 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 completed */
+ if (flags & TNY_HEADER_FLAG_CACHED)
+ mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_OPEN, G_OBJECT(window));
+ else
+ mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, G_OBJECT(window));
+
/* 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);
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:
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);
if (response != GTK_RESPONSE_OK)
return;
+ msg = modest_msg_view_get_message (MODEST_MSG_VIEW (priv->msg_view));
+/* folder = tny_msg_get_folder (msg); */
+/* tny_msg_uncache_attachments (msg); */
+/* tny_folder_refresh (folder, NULL); */
+/* g_object_unref (folder); */
+
+ modest_msg_view_set_message (MODEST_MSG_VIEW (priv->msg_view), msg);
+
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); */
}
+ tny_msg_rewrite_cache (msg);
g_list_foreach (mime_parts, (GFunc) g_object_unref, NULL);
g_list_free (mime_parts);
+ modest_platform_information_banner (NULL, NULL, _("mcen_ib_removing_attachment"));
+
}
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'))