* leak fixes; free both list and its elements when we call modest_account_mgr_account...
[modest] / src / maemo / modest-msg-view-window.c
index 3e9ecdd..8fffe52 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,6 +101,13 @@ static void set_toolbar_mode (ModestMsgViewWindow *self,
 
 static gboolean set_toolbar_transfer_mode     (ModestMsgViewWindow *self); 
 
+
+static void update_window_title (ModestMsgViewWindow *window);
+
+static gchar * 
+translate_func (const gchar *msgid,
+               const gchar *domain_name);
+
 /* list my signals */
 enum {
        /* MY_SIGNAL_1, */
@@ -114,6 +117,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 [] = {
@@ -142,6 +146,7 @@ struct _ModestMsgViewWindowPrivate {
        GtkWidget   *cancel_toolitem;
        GtkWidget   *prev_toolitem;
        GtkWidget   *next_toolitem;
+       ModestToolBarModes current_toolbar_mode;
 
        /* Optimized view enabled */
        gboolean optimized_view;
@@ -238,6 +243,7 @@ modest_msg_view_window_init (ModestMsgViewWindow *obj)
        priv->msg_view      = NULL;
        priv->header_model  = NULL;
        priv->clipboard_change_handler = 0;
+       priv->current_toolbar_mode = TOOLBAR_MODE_NORMAL;
 
        priv->optimized_view  = FALSE;
        priv->progress_bar_timeout = 0;
@@ -277,6 +283,9 @@ set_toolbar_mode (ModestMsgViewWindow *self,
        parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
        priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(self);
                        
+       /* Sets current toolbar mode */
+       priv->current_toolbar_mode = mode;
+
        switch (mode) {
        case TOOLBAR_MODE_NORMAL:
                widget = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarMessageNew");
@@ -484,7 +493,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);
 }
@@ -499,11 +509,11 @@ modest_msg_view_window_new (TnyMsg *msg,
        GObject *obj = NULL;
        ModestMsgViewWindowPrivate *priv = NULL;
        ModestWindowPrivate *parent_priv = NULL;
-       ModestDimmingRulesGroup *rules_group = NULL;
+       ModestDimmingRulesGroup *menu_rules_group = NULL;
+       ModestDimmingRulesGroup *toolbar_rules_group = NULL;
        GtkActionGroup *action_group = NULL;
        GError *error = NULL;
        GdkPixbuf *window_icon = NULL;
-       GtkAction *action = NULL;
 
        g_return_val_if_fail (msg, NULL);
        
@@ -519,8 +529,10 @@ modest_msg_view_window_new (TnyMsg *msg,
 
        action_group = gtk_action_group_new ("ModestMsgViewWindowActions");
        gtk_action_group_set_translation_domain (action_group, GETTEXT_PACKAGE);
+       gtk_action_group_set_translate_func (action_group, (GtkTranslateFunc) translate_func, GETTEXT_PACKAGE, g_free);
 
-       rules_group = modest_dimming_rules_group_new ("ModestCommonDimmingRules");
+       menu_rules_group = modest_dimming_rules_group_new ("ModestMenuDimmingRules");
+       toolbar_rules_group = modest_dimming_rules_group_new ("ModestToolbarDimmingRules");
 
        /* Add common actions */
        gtk_action_group_add_actions (action_group,
@@ -556,14 +568,20 @@ modest_msg_view_window_new (TnyMsg *msg,
        /* ****** */
 
        /* Add common dimming rules */
-       modest_dimming_rules_group_add_rules (rules_group, 
-                                             modest_msg_view_dimming_entries,
-                                             G_N_ELEMENTS (modest_msg_view_dimming_entries),
+       modest_dimming_rules_group_add_rules (menu_rules_group, 
+                                             modest_msg_view_menu_dimming_entries,
+                                             G_N_ELEMENTS (modest_msg_view_menu_dimming_entries),
+                                             self);
+       modest_dimming_rules_group_add_rules (toolbar_rules_group, 
+                                             modest_msg_view_toolbar_dimming_entries,
+                                             G_N_ELEMENTS (modest_msg_view_toolbar_dimming_entries),
                                              self);
 
        /* Insert dimming rules group for this window */
-       modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, rules_group);
-       g_object_unref (rules_group);
+       modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, menu_rules_group);
+       modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, toolbar_rules_group);
+       g_object_unref (menu_rules_group);
+       g_object_unref (toolbar_rules_group);
 
        /* Add accelerators */
        gtk_window_add_accel_group (GTK_WINDOW (obj), 
@@ -604,29 +622,30 @@ 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);
+       modest_msg_view_grab_focus(MODEST_MSG_VIEW (priv->msg_view));
 
-       /* 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);
-
-       gtk_widget_grab_focus (priv->msg_view);
+       update_window_title (MODEST_MSG_VIEW_WINDOW (obj));
 
        return MODEST_WINDOW(obj);
 }
 
 
+gboolean 
+modest_msg_view_window_toolbar_on_transfer_mode     (ModestMsgViewWindow *self)
+{
+       ModestMsgViewWindowPrivate *priv= NULL; 
+
+       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;
+}
 
 TnyHeader*
 modest_msg_view_window_get_header (ModestMsgViewWindow *self)
@@ -673,19 +692,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);
        
 }
 
@@ -849,8 +901,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;
@@ -884,8 +936,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;
@@ -974,12 +1037,17 @@ modest_msg_view_window_select_next_message (ModestMsgViewWindow *window)
                        if (!(flags & TNY_HEADER_FLAG_SEEN))
                                tny_header_set_flags (header, flags | TNY_HEADER_FLAG_SEEN);
 
+                       /* Msg download initied */
+
                        /* 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;
                }
        }
@@ -999,20 +1067,25 @@ 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);
 
@@ -1026,9 +1099,12 @@ modest_msg_view_window_select_first_message (ModestMsgViewWindow *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;
 }
@@ -1038,43 +1114,52 @@ 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);
+               /* 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 */
-                       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 */
+               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);             
 
-                       return TRUE;
-               }
+               /* Update toolbar dimming rules */
+               modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window));
+
+               g_object_unref (header);
+
+               return TRUE;
        }
 
        return FALSE;
@@ -1099,12 +1184,12 @@ 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);
-       gtk_widget_grab_focus (priv->msg_view);
+       update_window_title (MODEST_MSG_VIEW_WINDOW (self));
+       modest_msg_view_grab_focus (MODEST_MSG_VIEW (priv->msg_view));
 }
 
-static TnyFolderType
+TnyFolderType
 modest_msg_view_window_get_folder_type (ModestMsgViewWindow *window)
 {
        ModestMsgViewWindowPrivate *priv;
@@ -1137,77 +1222,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)
@@ -1363,7 +1377,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;
@@ -1373,19 +1387,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); */
        
 }
 
@@ -1491,6 +1505,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)
 {
@@ -1523,11 +1551,24 @@ modest_msg_view_window_view_attachment (ModestMsgViewWindow *window, TnyMimePart
 
        if (!TNY_IS_MSG (mime_part)) {
                gchar *filepath = NULL;
-               TnyFsStream *temp_stream = modest_maemo_utils_create_temp_stream (&filepath);
+               const gchar *att_filename = tny_mime_part_get_filename (mime_part);
+               gchar *extension = NULL;
+               TnyFsStream *temp_stream = NULL;
+
+               if (att_filename) {
+                       extension = g_strrstr (att_filename, ".");
+                       if (extension != NULL)
+                               extension++;
+               }
+
+               temp_stream = modest_maemo_utils_create_temp_stream (extension, &filepath);
 
                if (temp_stream) {
+                       const gchar *content_type;
+                       content_type = tny_mime_part_get_content_type (mime_part);
                        tny_mime_part_decode_to_stream (mime_part, TNY_STREAM (temp_stream));
-                       modest_platform_activate_file (filepath);
+                       
+                       modest_platform_activate_file (filepath, content_type);
                        g_object_unref (temp_stream);
                        g_free (filepath);
                        /* TODO: delete temporary file */
@@ -1644,7 +1685,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);
@@ -1691,3 +1736,31 @@ modest_msg_view_window_remove_attachments (ModestMsgViewWindow *window, GList *m
 {
 /*     g_message ("not implemented %s", __FUNCTION__); */
 }
+
+
+static void
+update_window_title (ModestMsgViewWindow *window)
+{
+       ModestMsgViewWindowPrivate *priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
+       TnyMsg *msg = NULL;
+       TnyHeader *header = NULL;
+       const gchar *subject = NULL;
+
+       msg = modest_msg_view_get_message (MODEST_MSG_VIEW (priv->msg_view));
+       if (msg != NULL) {
+               header = tny_msg_get_header (msg);
+               subject = tny_header_get_subject (header);
+       }
+
+       if ((subject == NULL)||(subject[0] == '\0'))
+               subject = _("mail_va_no_subject");
+
+       gtk_window_set_title (GTK_WINDOW (window), subject);
+}
+
+static gchar * 
+translate_func (const gchar *msgid,
+               const gchar *domain_name)
+{
+       return _(msgid);
+}