X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-ui-actions.c;h=7f210723e3c3998d7c7e4314122ea164c405009f;hp=739638f4b7aef5c920306da62ec2f7b3006922d4;hb=17650658e9c61cb055beecba2e865f2de3a2cbea;hpb=3aa82e8145fa08ff404f3a55eee70a0c4763cf31

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 739638f..7f21072 100644
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -918,7 +918,7 @@ modest_ui_actions_msg_retrieval_check (ModestMailOperation *mail_op,
 				proto = modest_tny_account_get_protocol_type (account);
 				protocol = modest_protocol_registry_get_protocol_by_type (modest_runtime_get_protocol_registry (), proto);
 				if (protocol)
-					format = modest_protocol_get_translation (protocol, MODEST_PROTOCOL_TRANSLATION_MSG_NOT_AVAILABLE);
+				  format = modest_protocol_get_translation (protocol, MODEST_PROTOCOL_TRANSLATION_MSG_NOT_AVAILABLE, subject);
 				g_object_unref (account);
 			}
 
@@ -1195,7 +1195,7 @@ check_memory_full_error (GtkWidget *parent_window, GError *err)
 	else if (err->code == TNY_SYSTEM_ERROR_MEMORY)
 		/* If the account was created in memory full
 		   conditions then tinymail won't be able to
-		   connect so it'll return this error code */				
+		   connect so it'll return this error code */
 		modest_platform_information_banner (parent_window,
 						    NULL, _("emev_ui_imap_inbox_select_error"));
 	else
@@ -3458,7 +3458,7 @@ modest_ui_actions_rename_folder_error_handler (ModestMailOperation *mail_op,
 		   message is opened for example */
 		message = _("emev_ni_internal_error");
 	} else {
-		message = _CS("ckdg_ib_unable_to_remove");
+		message = _CS("ckdg_ib_unable_to_rename");
 	}
 
 	/* We don't set a parent for the dialog because the dialog
@@ -5325,7 +5325,7 @@ modest_ui_actions_on_main_window_remove_attachments (GtkAction *action,
  * Checks if we need a connection to do the transfer and if the user
  * wants to connect to complete it
  */
-void
+static void
 modest_ui_actions_xfer_messages_check (GtkWindow *parent_window,
 				       TnyFolderStore *src_folder,
 				       TnyList *headers,
@@ -5337,8 +5337,6 @@ modest_ui_actions_xfer_messages_check (GtkWindow *parent_window,
 	TnyAccount *src_account;
 	gint uncached_msgs = 0;
 
-	uncached_msgs = header_list_count_uncached_msgs (headers);
-
 	/* We don't need any further check if
 	 *
 	 * 1- the source folder is local OR
@@ -5360,6 +5358,7 @@ modest_ui_actions_xfer_messages_check (GtkWindow *parent_window,
 	 * offline, it'll take place the next time we get a
 	 * connection)
 	 */
+	uncached_msgs = header_list_count_uncached_msgs (headers);
 	src_account = get_account_from_folder_store (src_folder);
 	if (uncached_msgs > 0) {
 		guint num_headers;
@@ -5382,11 +5381,11 @@ modest_ui_actions_xfer_messages_check (GtkWindow *parent_window,
 		if (remote_folder_has_leave_on_server (src_folder) && delete_originals) {
 			const gchar *account_name;
 			gboolean leave_on_server;
-			
+
 			account_name = modest_tny_account_get_parent_modest_account_name_for_server_account (src_account);
 			leave_on_server = modest_account_mgr_get_leave_on_server (modest_runtime_get_account_mgr (),
 										  account_name);
-			
+
 			if (leave_on_server == TRUE) {
 				*need_connection = FALSE;
 			} else {
@@ -5405,10 +5404,19 @@ static void
 xfer_messages_error_handler (ModestMailOperation *mail_op, 
 			     gpointer user_data)
 {
-	GObject *win = modest_mail_operation_get_source (mail_op);
-	modest_platform_run_information_dialog ((GtkWindow *) win, 
-						_("mail_in_ui_folder_move_target_error"), 
-						FALSE);
+	GObject *win;
+	const GError *error;
+
+	win = modest_mail_operation_get_source (mail_op);
+	error = modest_mail_operation_get_error (mail_op);
+
+	if (error && is_memory_full_error ((GError *) error))
+		modest_platform_information_banner ((GtkWidget *) win,
+						    NULL, _KR("cerm_device_memory_full"));
+	else
+		modest_platform_run_information_dialog ((GtkWindow *) win, 
+							_("mail_in_ui_folder_move_target_error"), 
+							FALSE);
 	if (win)
 		g_object_unref (win);
 }
@@ -5823,13 +5831,6 @@ modest_ui_actions_on_edit_mode_move_to (ModestWindow *win)
 		main_window = 
 			MODEST_MAIN_WINDOW (modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (),
 									       FALSE)); /* don't create */
-
-	/* Get the folder view widget if exists */
-	if (main_window)
-		folder_view = modest_main_window_get_child_widget (main_window,
-								   MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
-	else
-		folder_view = NULL;
 #endif
 
 	list_to_move = modest_platform_get_list_to_move (MODEST_WINDOW (win));