Reverted again the gdk_threads_enter/leave sentences:
[modest] / src / maemo / modest-msg-view-window.c
index 14e9e1b..29e67b6 100644 (file)
@@ -77,10 +77,6 @@ static gboolean modest_msg_view_window_window_state_event (GtkWidget *widget,
                                                           gpointer userdata);
 static void modest_msg_view_window_scroll_up (ModestWindow *window);
 static void modest_msg_view_window_scroll_down (ModestWindow *window);
-static gboolean modest_msg_view_window_is_last_message (ModestMsgViewWindow *window);
-static gboolean modest_msg_view_window_is_first_message (ModestMsgViewWindow *window);
-static TnyFolderType modest_msg_view_window_get_folder_type (ModestMsgViewWindow *window);
-static void modest_msg_view_window_update_dimmed (ModestMsgViewWindow *window);
 static void modest_msg_view_window_update_priority (ModestMsgViewWindow *window);
 
 static void modest_msg_view_window_show_toolbar   (ModestWindow *window,
@@ -105,11 +101,10 @@ static void set_toolbar_mode (ModestMsgViewWindow *self,
 
 static gboolean set_toolbar_transfer_mode     (ModestMsgViewWindow *self); 
 
-static void view_attachment_insensitive_press (GtkWidget *widget, ModestMsgViewWindow *window);
-static void save_attachment_insensitive_press (GtkWidget *widget, ModestMsgViewWindow *window);
 
 static void update_window_title (ModestMsgViewWindow *window);
 
+
 /* list my signals */
 enum {
        /* MY_SIGNAL_1, */
@@ -119,6 +114,7 @@ enum {
 
 static const GtkToggleActionEntry msg_view_toggle_action_entries [] = {
        { "FindInMessage",    GTK_STOCK_FIND,    N_("qgn_toolb_gene_find"), NULL, NULL, G_CALLBACK (modest_msg_view_window_toggle_find_toolbar), FALSE },
+       { "ToolsFindInMessage", NULL, N_("mcen_me_viewer_find"), NULL, NULL, G_CALLBACK (modest_msg_view_window_toggle_find_toolbar), FALSE },
 };
 
 static const GtkRadioActionEntry msg_view_zoom_action_entries [] = {
@@ -277,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));
 
@@ -287,18 +283,20 @@ set_toolbar_mode (ModestMsgViewWindow *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);
@@ -322,16 +320,15 @@ 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);
+               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);
@@ -494,7 +491,8 @@ modest_msg_view_window_new_with_header_model (TnyMsg *msg,
 
        modest_msg_view_window_update_priority (window);
 
-       modest_msg_view_window_update_dimmed (window);
+       /* Check toolbar dimming rules */
+       modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window));
 
        return MODEST_WINDOW(window);
 }
@@ -514,8 +512,6 @@ modest_msg_view_window_new (TnyMsg *msg,
        GtkActionGroup *action_group = NULL;
        GError *error = NULL;
        GdkPixbuf *window_icon = NULL;
-       GtkAction *action = NULL;
-       GtkWidget *widget = NULL;
 
        g_return_val_if_fail (msg, NULL);
        
@@ -623,33 +619,19 @@ modest_msg_view_window_new (TnyMsg *msg,
 
        priv->last_search = NULL;
 
-       modest_msg_view_window_update_dimmed (MODEST_MSG_VIEW_WINDOW (obj));
 
        /* 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 */
-       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/EditCopyMenu");
-       gtk_action_set_sensitive (action, FALSE);
-
-       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/EditCutMenu");
-       gtk_action_set_sensitive (action, FALSE);
-
-       /* also set the add to contacts status to false as it depends on clipboard status */
-       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ToolsMenu/ToolsAddToContactsMenu");
-       gtk_action_set_sensitive (action, FALSE);
-
-       /* insensitive handlers */
-       widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/MenuBar/AttachmentsMenu/ViewAttachmentMenu");
-       g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (view_attachment_insensitive_press), self);
-       widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/MenuBar/AttachmentsMenu/SaveAttachmentMenu");
-       g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (save_attachment_insensitive_press), self);
-
-       gtk_widget_grab_focus (priv->msg_view);
+       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);
 }
 
@@ -669,12 +651,21 @@ TnyHeader*
 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, 
@@ -710,20 +701,52 @@ modest_msg_view_window_get_message_uid (ModestMsgViewWindow *self)
        return (const gchar*) priv->msg_uid;
 }
 
+static void
+toggle_action_set_active_block_notify (GtkToggleAction *action,
+                                      gboolean value)
+{
+       GSList *proxies = NULL;
+
+       for (proxies = gtk_action_get_proxies (GTK_ACTION (action));
+            proxies != NULL; proxies = g_slist_next (proxies)) {
+               GtkWidget *widget = (GtkWidget *) proxies->data;
+               gtk_action_block_activate_from (GTK_ACTION (action), widget);
+       }
+
+       gtk_toggle_action_set_active (action, value);
+
+       for (proxies = gtk_action_get_proxies (GTK_ACTION (action));
+            proxies != NULL; proxies = g_slist_next (proxies)) {
+               GtkWidget *widget = (GtkWidget *) proxies->data;
+               gtk_action_unblock_activate_from (GTK_ACTION (action), widget);
+       }
+}
+
+
 static void 
 modest_msg_view_window_toggle_find_toolbar (GtkToggleAction *toggle,
                                            gpointer data)
 {
        ModestMsgViewWindow *window = MODEST_MSG_VIEW_WINDOW (data);
        ModestMsgViewWindowPrivate *priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
+       ModestWindowPrivate *parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
+       gboolean is_active;
+       GtkAction *action;
+
+       is_active = gtk_toggle_action_get_active (toggle);
 
-       if (gtk_toggle_action_get_active (toggle)) {
+       if (is_active) {
                gtk_widget_show (priv->find_toolbar);
                hildon_find_toolbar_highlight_entry (HILDON_FIND_TOOLBAR (priv->find_toolbar), TRUE);
        } else {
                gtk_widget_hide (priv->find_toolbar);
        }
 
+       /* update the toggle buttons status */
+       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/FindInMessage");
+       toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), is_active);
+       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ToolsMenu/ToolsFindInMessageMenu");
+       toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), is_active);
        
 }
 
@@ -748,8 +771,9 @@ modest_msg_view_window_find_toolbar_search (GtkWidget *widget,
 
        g_object_get (G_OBJECT (widget), "prefix", &current_search, NULL);
 
-       if ((current_search == NULL) && (strcmp (current_search, "") == 0)) {
+       if ((current_search == NULL) || (strcmp (current_search, "") == 0)) {
                g_free (current_search);
+               hildon_banner_show_information (NULL, NULL, dgettext("hildon-common-strings", "ecdg_ib_find_rep_enter_text"));
                return;
        }
 
@@ -759,8 +783,15 @@ modest_msg_view_window_find_toolbar_search (GtkWidget *widget,
                priv->last_search = g_strdup (current_search);
                result = modest_msg_view_search (MODEST_MSG_VIEW (priv->msg_view),
                                                 priv->last_search);
+               if (!result) {
+                       hildon_banner_show_information (NULL, NULL, dgettext("hildon-libs", "ckct_ib_find_no_matches"));
+               } 
        } else {
-               modest_msg_view_search_next (MODEST_MSG_VIEW (priv->msg_view));
+               if (!modest_msg_view_search_next (MODEST_MSG_VIEW (priv->msg_view))) {
+                       hildon_banner_show_information (NULL, NULL, dgettext("hildon-libs", "ckct_ib_find_search_complete"));
+                       g_free (priv->last_search);
+                       priv->last_search = NULL;
+               }
        }
        
        g_free (current_search);
@@ -804,7 +835,7 @@ modest_msg_view_window_zoom_plus (ModestWindow *window)
        group = gtk_radio_action_get_group (zoom_radio_action);
 
        if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (group->data))) {
-               hildon_banner_show_information (NULL, NULL, _("mcen_ib_max_zoom_level"));
+               hildon_banner_show_information (NULL, NULL, dgettext("hildon-common-strings", "ckct_ib_max_zoom_level_reached"));
                return FALSE;
        }
 
@@ -836,7 +867,7 @@ modest_msg_view_window_zoom_minus (ModestWindow *window)
                                gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (node->next->data), TRUE);
                                return TRUE;
                        } else {
-                               hildon_banner_show_information (NULL, NULL, _("mcen_ib_min_zoom_level"));
+                         hildon_banner_show_information (NULL, NULL, dgettext("hildon-common-strings", "ckct_ib_min_zoom_level_reached"));
                                return FALSE;
                        }
                        break;
@@ -887,8 +918,8 @@ modest_msg_view_window_scroll_down (ModestWindow *window)
        g_signal_emit_by_name (G_OBJECT (priv->main_scroll), "scroll-child", GTK_SCROLL_STEP_DOWN, FALSE);
 }
 
-static gboolean 
-modest_msg_view_window_is_last_message (ModestMsgViewWindow *window)
+gboolean
+modest_msg_view_window_last_message_selected (ModestMsgViewWindow *window)
 {
        GtkTreePath *path;
        ModestMsgViewWindowPrivate *priv;
@@ -912,9 +943,9 @@ modest_msg_view_window_is_last_message (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;
@@ -922,8 +953,19 @@ modest_msg_view_window_is_last_message (ModestMsgViewWindow *window)
        
 }
 
-static gboolean 
-modest_msg_view_window_is_first_message (ModestMsgViewWindow *window)
+gboolean
+modest_msg_view_window_has_headers_model (ModestMsgViewWindow *window)
+{
+       ModestMsgViewWindowPrivate *priv;
+
+       g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window), TRUE);
+       priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
+
+       return priv->header_model != NULL;
+}
+
+gboolean
+modest_msg_view_window_first_message_selected (ModestMsgViewWindow *window)
 {
        GtkTreePath *path;
        ModestMsgViewWindowPrivate *priv;
@@ -1010,16 +1052,22 @@ modest_msg_view_window_select_next_message (ModestMsgViewWindow *window)
                        /* 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);
-
-                       /* Msg download initied */
+                               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);
                        g_object_unref (mail_op);
 
+                       /* Update toolbar dimming rules */
+                       modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window));
+
                        return TRUE;
                }
        }
@@ -1039,36 +1087,49 @@ modest_msg_view_window_select_first_message (ModestMsgViewWindow *self)
        g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (self), FALSE);
        priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (self);
 
-       path = gtk_tree_path_new_from_string ("0");
+       /* Check that the model is not empty */
+       if (!gtk_tree_model_get_iter_first (priv->header_model, &iter))
+               return FALSE;
 
-       /* Update the row reference */
-       /* Get first message */
-       gtk_tree_model_get_iter (priv->header_model, &iter, path);
-       gtk_tree_model_get (priv->header_model, &iter, TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN,
+       /* Get the header */
+       gtk_tree_model_get (priv->header_model, 
+                           &iter, 
+                           TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN,
                            &header, -1);
        
        g_return_val_if_fail (TNY_IS_HEADER (header), FALSE);
-       if (tny_header_get_flags (header) & TNY_HEADER_FLAG_DELETED)
+       if (tny_header_get_flags (header) & TNY_HEADER_FLAG_DELETED) {
+               g_object_unref (header);
                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);
+       
+       /* 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);
+
+       /* Update toolbar dimming rules */
+       modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (self));
        
        /* Free */
-/*     g_object_unref (header); */
+       g_object_unref (header);
 
        return TRUE;
 }
@@ -1078,43 +1139,57 @@ 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);
 
-       if (priv->header_model) {
-               GtkTreePath *path;
+       /* Return inmediatly if there is no header model */
+       if (!priv->header_model)
+               return FALSE;
 
-               path = gtk_tree_row_reference_get_path (priv->row_reference);
-               while (gtk_tree_path_prev (path)) {
-                       TnyHeader *header;
-                       GtkTreeIter iter;
+       path = gtk_tree_row_reference_get_path (priv->row_reference);
+       while (gtk_tree_path_prev (path)) {
+               TnyHeader *header;
+               GtkTreeIter iter;
 
-                       gtk_tree_model_get_iter (priv->header_model, &iter, path);
-                       gtk_tree_model_get (priv->header_model, &iter, TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN,
-                                           &header, -1);
-                       if (!header)
-                               break;
-                       if (tny_header_get_flags (header) & TNY_HEADER_FLAG_DELETED)
-                               continue;
+               gtk_tree_model_get_iter (priv->header_model, &iter, path);
+               gtk_tree_model_get (priv->header_model, &iter, 
+                                   TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN,
+                                   &header, -1);
+               if (!header)
+                       break;
+               if (tny_header_get_flags (header) & TNY_HEADER_FLAG_DELETED) {
+                       g_object_unref (header);
+                       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);
+               /* 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);
-
-                       /* New mail operation */
+               /* Mark as read */
+               flags = tny_header_get_flags (header);
+               if (!(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));
-                       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);             
+               
+               /* New mail operation */
+               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);             
 
-                       return TRUE;
-               }
+               /* Update toolbar dimming rules */
+               modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window));
+
+               g_object_unref (header);
+
+               return TRUE;
        }
 
        return FALSE;
@@ -1139,13 +1214,15 @@ view_msg_cb (ModestMailOperation *mail_op,
 
        /* Set new message */
        modest_msg_view_set_message (MODEST_MSG_VIEW (priv->msg_view), msg);
-       modest_msg_view_window_update_dimmed (self);
        modest_msg_view_window_update_priority (self);
        update_window_title (MODEST_MSG_VIEW_WINDOW (self));
-       gtk_widget_grab_focus (priv->msg_view);
+       modest_msg_view_grab_focus (MODEST_MSG_VIEW (priv->msg_view));
+
+       /* Free new references */
+       g_object_unref (self);
 }
 
-static TnyFolderType
+TnyFolderType
 modest_msg_view_window_get_folder_type (ModestMsgViewWindow *window)
 {
        ModestMsgViewWindowPrivate *priv;
@@ -1178,77 +1255,6 @@ modest_msg_view_window_get_folder_type (ModestMsgViewWindow *window)
        return folder_type;
 }
 
-static void
-modest_msg_view_window_update_dimmed (ModestMsgViewWindow *window)
-{
-       ModestWindowPrivate *parent_priv;
-       ModestMsgViewWindowPrivate *priv;
-       GtkAction *widget;
-       gboolean is_first, is_last;
-       TnyFolderType folder_type;
-       gboolean is_not_sent;
-       GList *attachments, *node;
-       gint n_selected;
-       gboolean selected_messages = FALSE;
-       gboolean nested_attachments = FALSE;
-
-       parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
-       priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
-
-       is_first = modest_msg_view_window_is_first_message (window);
-       is_last = modest_msg_view_window_is_last_message (window);
-
-       widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarMessageBack");
-       gtk_action_set_sensitive (widget, !is_first);
-       widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ViewMenu/ViewPreviousMessageMenu");
-       gtk_action_set_sensitive (widget, !is_first);
-               
-       widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarMessageNext");
-       gtk_action_set_sensitive (widget, !is_last);
-       widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ViewMenu/ViewNextMessageMenu");
-       gtk_action_set_sensitive (widget, !is_last);
-
-       folder_type = modest_msg_view_window_get_folder_type (MODEST_MSG_VIEW_WINDOW (window));
-       is_not_sent = ((folder_type == TNY_FOLDER_TYPE_DRAFTS)||(folder_type == TNY_FOLDER_TYPE_OUTBOX));
-       widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarMessageReply");
-       gtk_action_set_sensitive (widget, !is_not_sent);
-       widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/MessageMenu/MessageReplyMenu");
-       gtk_action_set_sensitive (widget, !is_not_sent);
-       widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/MessageMenu/MessageReplyAllMenu");
-       gtk_action_set_sensitive (widget, !is_not_sent);
-       widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/MessageMenu/MessageForwardMenu");
-       gtk_action_set_sensitive (widget, !is_not_sent);
-
-       /* Attachment actions dimming */
-       attachments = modest_msg_view_get_selected_attachments (MODEST_MSG_VIEW (priv->msg_view));
-       n_selected = g_list_length (attachments);
-       for (node = attachments; node != NULL; node = g_list_next (node)) {
-               TnyMimePart *mime_part = TNY_MIME_PART (node->data);
-               TnyList *nested_list = tny_simple_list_new ();
-               if (!tny_mime_part_is_attachment (mime_part)) {
-                       selected_messages = TRUE;
-                       break;
-               }
-               tny_mime_part_get_parts (mime_part, nested_list);
-               if (tny_list_get_length (nested_list) > 0)
-                       nested_attachments = TRUE;
-               g_object_unref (nested_list);
-       }
-       g_list_free (attachments);
-
-       widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/AttachmentsMenu/ViewAttachmentMenu");
-       gtk_action_set_sensitive (widget, n_selected == 1);
-       widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/AttachmentsMenu/SaveAttachmentMenu");
-       gtk_action_set_sensitive (widget, (n_selected > 0) && (!selected_messages) &&  (!nested_attachments));
-
-       /* Dimming depending of message being an attachment or not. It's not an attachment if
-        * we opened it outside a folder view */
-       widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/MessageMenu/MessageDeleteMenu");
-       gtk_action_set_sensitive (widget, priv->header_model != NULL);
-       widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/EditMoveToMenu");
-       gtk_action_set_sensitive (widget, priv->header_model != NULL);
-
-}
 
 static void
 modest_msg_view_window_update_priority (ModestMsgViewWindow *window)
@@ -1404,7 +1410,7 @@ modest_msg_view_window_clipboard_owner_change (GtkClipboard *clipboard,
                                               ModestMsgViewWindow *window)
 {
        ModestWindowPrivate *parent_priv;
-       GtkAction *action;
+/*     GtkAction *action; */
        gboolean is_address;
        gchar *selection;
        GtkWidget *focused;
@@ -1414,19 +1420,19 @@ modest_msg_view_window_clipboard_owner_change (GtkClipboard *clipboard,
 
        is_address = ((selection != NULL) && (modest_text_utils_validate_recipient (selection)));
        
-       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ToolsMenu/ToolsAddToContactsMenu");
-       gtk_action_set_sensitive (action, is_address);
+/*     action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ToolsMenu/ToolsAddToContactsMenu"); */
+/*     gtk_action_set_sensitive (action, is_address); */
 
        focused = gtk_window_get_focus (GTK_WINDOW (window));
 
-       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/EditCopyMenu");
-       gtk_action_set_sensitive (action, (selection != NULL) && (!MODEST_IS_ATTACHMENTS_VIEW (focused)));
+/*     action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/EditCopyMenu"); */
+/*     gtk_action_set_sensitive (action, (selection != NULL) && (!MODEST_IS_ATTACHMENTS_VIEW (focused))); */
 
-       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/EditCutMenu");
-       gtk_action_set_sensitive (action, (selection != NULL) && (!MODEST_IS_ATTACHMENTS_VIEW (focused)));
+/*     action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/EditCutMenu"); */
+/*     gtk_action_set_sensitive (action, (selection != NULL) && (!MODEST_IS_ATTACHMENTS_VIEW (focused))); */
 
        g_free (selection);
-       modest_msg_view_window_update_dimmed (window);
+/*     modest_msg_view_window_update_dimmed (window); */
        
 }
 
@@ -1492,6 +1498,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:
@@ -1532,6 +1539,20 @@ on_queue_changed (ModestMailOperationQueue *queue,
        }
 }
 
+GList *
+modest_msg_view_window_get_attachments (ModestMsgViewWindow *win) 
+{
+       ModestMsgViewWindowPrivate *priv;
+       GList *selected_attachments = NULL;
+       
+       g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (win), NULL);
+       priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (win);
+
+       selected_attachments = modest_msg_view_get_selected_attachments (MODEST_MSG_VIEW (priv->msg_view));
+       
+       return selected_attachments;
+}
+
 void
 modest_msg_view_window_view_attachment (ModestMsgViewWindow *window, TnyMimePart *mime_part)
 {
@@ -1547,7 +1568,7 @@ modest_msg_view_window_view_attachment (ModestMsgViewWindow *window, TnyMimePart
                if (selected_attachments == NULL) {
                        error = TRUE;
                } else if (g_list_length (selected_attachments) > 1) {
-                       hildon_banner_show_information (NULL, NULL, _("TODO: more than one attachment is selected"));
+                       hildon_banner_show_information (NULL, NULL, _("mcen_ib_unable_to_display_more"));
                        error = TRUE;
                } else {
                        mime_part = (TnyMimePart *) selected_attachments->data;
@@ -1634,7 +1655,7 @@ save_mime_part_to_file_with_checks (GtkWindow *parent, const gchar *filename, Tn
        if (modest_maemo_utils_file_exists (filename)) {
                GtkWidget *confirm_overwrite_dialog;
                confirm_overwrite_dialog = hildon_note_new_confirmation (GTK_WINDOW (parent),
-                                                                        _("TODO: confirm overwrite"));
+                                                                        _("emev_nc_replace_files"));
                if (gtk_dialog_run (GTK_DIALOG (confirm_overwrite_dialog)) != GTK_RESPONSE_OK) {
                        gtk_widget_destroy (confirm_overwrite_dialog);
                        return FALSE;
@@ -1698,7 +1719,11 @@ modest_msg_view_window_save_attachments (ModestMsgViewWindow *window, GList *mim
        } else {
                GtkWidget *save_dialog = NULL;
                gchar *folder;
-               save_dialog = hildon_file_chooser_dialog_new (GTK_WINDOW (window), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
+               gchar *save_multiple_str = g_strdup_printf (_("FIXME: %d attachments"), 
+                                                           g_list_length (mime_parts));
+               save_dialog = hildon_file_chooser_dialog_new (GTK_WINDOW (window), GTK_FILE_CHOOSER_ACTION_SAVE);
+               g_object_set (G_OBJECT (save_dialog), "save-multiple", save_multiple_str, NULL);
+               
                folder = g_build_filename (g_get_home_dir (), DEFAULT_FOLDER, NULL);
                gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (save_dialog), folder);
                g_free (folder);
@@ -1741,62 +1766,70 @@ modest_msg_view_window_save_attachments (ModestMsgViewWindow *window, GList *mim
 }
 
 void
-modest_msg_view_window_remove_attachments (ModestMsgViewWindow *window, GList *mime_parts)
-{
-/*     g_message ("not implemented %s", __FUNCTION__); */
-}
-
-static void 
-view_attachment_insensitive_press (GtkWidget *widget, ModestMsgViewWindow *window)
+modest_msg_view_window_remove_attachments (ModestMsgViewWindow *window)
 {
-       GList *attachments = NULL;
-       ModestMsgViewWindowPrivate *priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
+       ModestMsgViewWindowPrivate *priv;
+       GList *mime_parts = NULL, *node;
+       gchar *confirmation_message;
+       gint response;
+       gint n_attachments;
+       TnyMsg *msg;
+/*     TnyFolder *folder; */
 
-       attachments = modest_msg_view_get_selected_attachments (MODEST_MSG_VIEW (priv->msg_view));
-       if (g_list_length (attachments) > 1)
-               hildon_banner_show_information (NULL, NULL, _("mcen_ib_unable_to_display_more"));
+       g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window));
+       priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
 
-       g_list_free (attachments);
+       mime_parts = modest_msg_view_get_selected_attachments (MODEST_MSG_VIEW (priv->msg_view));
+       if (mime_parts == NULL)
+               return;
 
-}
+       n_attachments = g_list_length (mime_parts);
+       if (n_attachments == 1) {
+               const gchar *filename;
 
-static void 
-save_attachment_insensitive_press (GtkWidget *widget, ModestMsgViewWindow *window)
-{
-       GList *attachments = NULL;
-       ModestMsgViewWindowPrivate *priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
-       gboolean selected_messages = FALSE;
-       gboolean nested_attachments = FALSE;
-       gint n_selected = 0;
-       GList *node = NULL;
-
-       attachments = modest_msg_view_get_selected_attachments (MODEST_MSG_VIEW (priv->msg_view));
-       n_selected = g_list_length (attachments);
-       for (node = attachments; node != NULL; node = g_list_next (node)) {
-               TnyMimePart *mime_part = TNY_MIME_PART (node->data);
-               TnyList *nested_list = tny_simple_list_new ();
-               if (!tny_mime_part_is_attachment (mime_part)) {
-                       selected_messages = TRUE;
-                       break;
+               if (TNY_IS_MSG (mime_parts->data)) {
+                       TnyHeader *header;
+                       header = tny_msg_get_header (TNY_MSG (mime_parts->data));
+                       filename = tny_header_get_subject (header);
+                       g_object_unref (header);
+                       if (filename == NULL)
+                               filename = _("mail_va_no_subject");
+               } else {
+                       filename = tny_mime_part_get_filename (TNY_MIME_PART (mime_parts->data));
                }
-               tny_mime_part_get_parts (mime_part, nested_list);
-               if (tny_list_get_length (nested_list) > 0)
-                       nested_attachments = TRUE;
-               g_object_unref (nested_list);
+               confirmation_message = g_strdup_printf (_("mcen_nc_purge_file_text"), filename);
+       } else {
+               confirmation_message = g_strdup_printf (ngettext("mcen_nc_purge_file_text", 
+                                                                "mcen_nc_purge_files_text", 
+                                                                n_attachments), n_attachments);
        }
-       g_list_free (attachments);
-       if (selected_messages) {
-               hildon_banner_show_information (NULL, NULL, _("mcen_ib_unable_to_save_attach_mail"));
-       } else if (nested_attachments) {
-               hildon_banner_show_information (NULL, NULL, _("FIXME:unable to save attachments with nested elements"));
-       } else if (n_selected == 0) {
-               hildon_banner_show_information (NULL, NULL, _("FIXME:no attachment selected"));
+       response = modest_platform_run_confirmation_dialog (GTK_WINDOW (window),
+                                                           confirmation_message);
+       g_free (confirmation_message);
+
+       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)) {
+               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"));
 
-       return ;
-               
 }
 
+
 static void
 update_window_title (ModestMsgViewWindow *window)
 {
@@ -1809,6 +1842,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'))
@@ -1816,3 +1850,4 @@ update_window_title (ModestMsgViewWindow *window)
 
        gtk_window_set_title (GTK_WINDOW (window), subject);
 }
+