X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-msg-view-window.c;h=ea5ba0d7172fb98cdaad682e6f3841319e01eb6d;hp=226d5b593fef3cf3d99a8ba30c1092c3347158fc;hb=f0308a557ea83318786ab332f5de2a3be5edc74a;hpb=2c6e266a8b3d42e3054735b7ff5a79b80bf99127

diff --git a/src/hildon2/modest-msg-view-window.c b/src/hildon2/modest-msg-view-window.c
index 226d5b5..ea5ba0d 100644
--- a/src/hildon2/modest-msg-view-window.c
+++ b/src/hildon2/modest-msg-view-window.c
@@ -1537,7 +1537,7 @@ modest_msg_view_window_zoom_plus (ModestWindow *window)
 
 	/* set zoom level */
 	int_zoom = (gint) rint (zoom_level*100.0+0.1);
-	banner_text = g_strdup_printf (_("wdgt_ib_zoom"), int_zoom);
+	banner_text = g_strdup_printf (_HL("wdgt_ib_zoom"), int_zoom);
 	modest_platform_information_banner (GTK_WIDGET (window), NULL, banner_text);
 	g_free (banner_text);
 	modest_zoomable_set_zoom (MODEST_ZOOMABLE (priv->msg_view), zoom_level);
@@ -1578,7 +1578,7 @@ modest_msg_view_window_zoom_minus (ModestWindow *window)
 
 	/* set zoom level */
 	int_zoom = (gint) rint (zoom_level*100.0+0.1);
-	banner_text = g_strdup_printf (_("wdgt_ib_zoom"), int_zoom);
+	banner_text = g_strdup_printf (_HL("wdgt_ib_zoom"), int_zoom);
 	modest_platform_information_banner (GTK_WIDGET (window), NULL, banner_text);
 	g_free (banner_text);
 	modest_zoomable_set_zoom (MODEST_ZOOMABLE (priv->msg_view), zoom_level);
@@ -2394,7 +2394,8 @@ modest_msg_view_window_get_attachments (ModestMsgViewWindow *win)
 	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));
+	/* In Hildon 2.2 as there's no selection we assume we have all attachments selected */
+	selected_attachments = modest_msg_view_get_attachments (MODEST_MSG_VIEW (priv->msg_view));
 	
 	return selected_attachments;
 }
@@ -2771,7 +2772,9 @@ modest_msg_view_window_save_attachments (ModestMsgViewWindow *window, TnyList *m
 	priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
 
 	if (mime_parts == NULL) {
-		mime_parts = modest_msg_view_get_selected_attachments (MODEST_MSG_VIEW (priv->msg_view));
+		/* In Hildon 2.2 save and delete operate over all the attachments as there's no
+		 * selection available */
+		mime_parts = modest_msg_view_get_attachments (MODEST_MSG_VIEW (priv->msg_view));
 		if (mime_parts == NULL || tny_list_get_length (mime_parts) == 0)
 			return;
 	} else {
@@ -2867,10 +2870,10 @@ modest_msg_view_window_remove_attachments (ModestMsgViewWindow *window, gboolean
 	g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window));
 	priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
 
-	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));
+	/* In hildon 2.2 we ignore the get_all flag as we always get all attachments. This is
+	 * because we don't have selection
+	 */
+	mime_parts = modest_msg_view_get_attachments (MODEST_MSG_VIEW (priv->msg_view));
 		
 	/* Remove already purged messages from mime parts list */
 	iter = tny_list_create_iterator (mime_parts);