X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhildon2%2Fmodest-msg-view-window.c;h=280a3fff2749c1ebb9eaf410c5431c0196536334;hb=eb46b1a39b2c65cfeaa37e5100ab4164098d8728;hp=fca809312f72ee685b6257b4ead14d5d0207908b;hpb=d2b7b5190cdfa7b235eba09687beed4f48d57bba;p=modest

diff --git a/src/hildon2/modest-msg-view-window.c b/src/hildon2/modest-msg-view-window.c
index fca8093..280a3ff 100644
--- a/src/hildon2/modest-msg-view-window.c
+++ b/src/hildon2/modest-msg-view-window.c
@@ -2197,7 +2197,6 @@ modest_msg_view_window_show_toolbar (ModestWindow *self,
 {
 	ModestMsgViewWindowPrivate *priv = NULL;
 	ModestWindowPrivate *parent_priv;
-	GtkWidget *reply_button = NULL, *menu = NULL;
 
 	parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
 	priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(self);
@@ -2219,13 +2218,6 @@ modest_msg_view_window_show_toolbar (ModestWindow *self,
 		hildon_window_add_toolbar (HILDON_WINDOW (self), 
 					   GTK_TOOLBAR (parent_priv->toolbar));
 
-		/* Set reply button tap and hold menu */
-		reply_button = gtk_ui_manager_get_widget (parent_priv->ui_manager, 
-							  "/ToolBar/ToolbarMessageReply");
-		menu = gtk_ui_manager_get_widget (parent_priv->ui_manager, 
-						  "/ToolbarReplyCSM");
-		if (menu && reply_button)
-			gtk_widget_tap_and_hold_setup (GTK_WIDGET (reply_button), menu, NULL, 0);
 	}
 
 	if (show_toolbar) {
@@ -2434,8 +2426,10 @@ on_decode_to_stream_async_handler (TnyMimePart *mime_part,
 	gchar *filepath = (gchar *) user_data;
 
 	if (cancelled || err) {
-		modest_platform_information_banner (NULL, NULL, 
-						    _("mail_ib_file_operation_failed"));
+		if (err) {
+			modest_platform_information_banner (NULL, NULL,
+							    _KR("cerm_device_memory_full"));
+		}
 		goto free;
 	}
 
@@ -2490,15 +2484,13 @@ modest_msg_view_window_view_attachment (ModestMsgViewWindow *window,
 		g_object_unref (selected_attachments);
 
 		if (error)
-			return;
+			goto frees;
 	} else {
 		g_object_ref (mime_part);
 	}
 
-	if (tny_mime_part_is_purged (mime_part)) {
-		g_object_unref (mime_part);
-		return;
-	}
+	if (tny_mime_part_is_purged (mime_part))
+		goto frees;
 
 	if (!modest_tny_mime_part_is_msg (mime_part)) {
 		gchar *filepath = NULL;
@@ -2560,7 +2552,12 @@ modest_msg_view_window_view_attachment (ModestMsgViewWindow *window,
 			gtk_widget_show_all (GTK_WIDGET (msg_win));
 		}
 	}
-	g_object_unref (mime_part);
+
+ frees:
+	if (attachment_uid)
+		g_free (attachment_uid);
+	if (mime_part)
+		g_object_unref (mime_part);
 }
 
 typedef struct
@@ -2638,7 +2635,7 @@ save_mime_part_to_file (SaveMimePartInfo *info)
 			g_warning ("modest: could not save attachment %s: %d (%s)\n", pair->filename, error?error->code:-1, error?error->message:"Unknown error");
 
 			if ((error->domain == TNY_ERROR_DOMAIN) && 
-			    (error->code = TNY_IO_ERROR_WRITE) &&
+			    (error->code == TNY_IO_ERROR_WRITE) &&
 			    (errno == ENOSPC)) {
 				info->result = GNOME_VFS_ERROR_NO_SPACE;
 			} else {
@@ -2770,7 +2767,7 @@ modest_msg_view_window_save_attachments (ModestMsgViewWindow *window, TnyList *m
 		/* 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 (!modest_maemo_utils_select_attachments (GTK_WINDOW (window), mime_parts)) {
+		if (!modest_maemo_utils_select_attachments (GTK_WINDOW (window), mime_parts, FALSE)) {
 			g_object_unref (mime_parts);
 			return;
 		}
@@ -2886,7 +2883,7 @@ modest_msg_view_window_remove_attachments (ModestMsgViewWindow *window, gboolean
 	}
 	g_object_unref (iter);
 
-	if (!modest_maemo_utils_select_attachments (GTK_WINDOW (window), mime_parts) ||
+	if (!modest_maemo_utils_select_attachments (GTK_WINDOW (window), mime_parts, TRUE) ||
 	    tny_list_get_length (mime_parts) == 0) {
 		g_object_unref (mime_parts);
 		return;