X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-platform.c;h=de5d03faa01dbdc3184bf9d8b7214186ef5b5eba;hb=f21b7614601c08eed2e3ffd68ef870d28f10c832;hp=c301dfd5e76694294fa00017ce5c906c23f1b880;hpb=f818493dc6e73f79bb91966da9bbaa02d64e5134;p=modest

diff --git a/src/hildon2/modest-platform.c b/src/hildon2/modest-platform.c
index c301dfd..de5d03f 100644
--- a/src/hildon2/modest-platform.c
+++ b/src/hildon2/modest-platform.c
@@ -107,8 +107,11 @@
 #define COMMON_FOLDER_DIALOG_ENTRY "entry"
 #define COMMON_FOLDER_DIALOG_ACCOUNT_PICKER "account-picker"
 #define FOLDER_PICKER_CURRENT_FOLDER "current-folder"
+#define FOLDER_PICKER_ORIGINAL_ACCOUNT "original-account"
 #define MODEST_ALARMD_APPID PACKAGE_NAME
 
+static ca_context *ca_con = NULL;
+
 
 static void modest_platform_play_email_tone (void);
 
@@ -163,23 +166,16 @@ gboolean
 modest_platform_init (int argc, char *argv[])
 {
 	osso_context_t *osso_context;
-	
 	osso_hw_state_t hw_state = { 0 };
-	DBusConnection *con;	
+	DBusConnection *con;
 	GSList *acc_names;
-	
+
 	if (!check_required_files ()) {
 		g_printerr ("modest: missing required files\n");
 		return FALSE;
 	}
-	
-	osso_context = 	osso_initialize(PACKAGE,PACKAGE_VERSION,
-					FALSE, NULL);	
-	if (!osso_context) {
-		g_printerr ("modest: failed to acquire osso context\n");
-		return FALSE;
-	}
-	modest_maemo_utils_set_osso_context (osso_context);
+
+	osso_context = modest_maemo_utils_get_osso_context();
 
 	if ((con = osso_get_dbus_connection (osso_context)) == NULL) {
 		g_printerr ("modest: could not get dbus connection\n");
@@ -374,7 +370,7 @@ modest_platform_activate_uri (const gchar *uri)
 			modest_window_mgr_get_main_window (modest_runtime_get_window_mgr(), FALSE);
 		hildon_banner_show_information (parent ? GTK_WIDGET(parent): NULL, NULL,
 						_("mcen_ib_unsupported_link"));
-		g_warning ("%s: cannot open uri '%s'", __FUNCTION__,uri);
+		g_debug ("%s: cannot open uri '%s'", __FUNCTION__,uri);
 	} 
 	
 	return result;
@@ -479,9 +475,9 @@ modest_platform_show_uri_popup (const gchar *uri)
 		 * and/or might have security implications
 		 * we still allow to copy the url though
 		 */
-		if (!g_str_has_prefix (uri, "file:")) { 		
-		
-			GSList *node;			
+		if (!g_str_has_prefix (uri, "file:")) {
+
+			GSList *node;
 			popup_info->actions = actions_list;
 			popup_info->uri = g_strdup (uri);
 
@@ -493,6 +489,7 @@ modest_platform_show_uri_popup (const gchar *uri)
 				action_name = hildon_uri_action_get_name (action);
 				translation_domain = hildon_uri_action_get_translation_domain (action);
 				menu_item = gtk_menu_item_new_with_label (dgettext(translation_domain, action_name));
+				hildon_gtk_widget_set_theme_size (menu_item, MODEST_EDITABLE_SIZE);
 				g_object_set_data (G_OBJECT(menu_item), HILDON_OSSO_URI_ACTION, (gpointer)action_name);  /* hack */
 				g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (activate_uri_popup_item),
 						  popup_info);
@@ -539,7 +536,7 @@ modest_platform_get_icon (const gchar *name, guint icon_size)
 					   GTK_ICON_LOOKUP_NO_SVG,
 					   &err);
 	if (!pixbuf) {
-		g_printerr ("modest: error loading theme icon '%s': %s\n",
+		g_warning ("Error loading theme icon '%s': %s\n",
 			    name, err->message);
 		g_error_free (err);
 	} 
@@ -692,12 +689,14 @@ folder_chooser_activated (ModestFolderView *folder_view,
 }
 
 static TnyFolderStore *
-folder_chooser_dialog_run (ModestFolderView *original, TnyFolderStore *current)
+folder_chooser_dialog_run (ModestFolderView *original,
+			   TnyFolderStore *current,
+			   GtkButton *picker)
 {
 	GtkWidget *folder_view;
 	FolderChooserData userdata = {NULL, NULL};
 	GtkWidget *pannable;
-	gchar *visible_id = NULL;
+	const gchar *visible_id = NULL;
 
 	userdata.dialog = hildon_dialog_new ();
 	pannable = hildon_pannable_area_new ();
@@ -705,30 +704,36 @@ folder_chooser_dialog_run (ModestFolderView *original, TnyFolderStore *current)
 
 	gtk_window_set_title (GTK_WINDOW (userdata.dialog), _FM("ckdg_ti_change_folder"));
 
-	modest_folder_view_copy_model (MODEST_FOLDER_VIEW (original), 
+	modest_folder_view_copy_model (MODEST_FOLDER_VIEW (original),
 				       MODEST_FOLDER_VIEW (folder_view));
 
-	if (TNY_IS_FOLDER_STORE (current)) {
-		if (TNY_IS_ACCOUNT (current)) {
-			visible_id = g_strdup (tny_account_get_id (TNY_ACCOUNT (current)));
-		} else if (TNY_IS_FOLDER (current)) {
-			TnyAccount *account;
-
-			account = tny_folder_get_account (TNY_FOLDER (current));
-			if (account) {
-				visible_id = g_strdup (tny_account_get_id (TNY_ACCOUNT (current)));
+	if (TNY_IS_ACCOUNT (current)) {
+		/* Local folders and MMC account are always shown
+		   along with the currently visible server account */
+		if (modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (current)) ||
+		    modest_tny_account_is_memory_card_account (TNY_ACCOUNT (current)))
+			visible_id = g_object_get_data ((GObject *) picker, FOLDER_PICKER_ORIGINAL_ACCOUNT);
+		else
+			visible_id = tny_account_get_id (TNY_ACCOUNT (current));
+	} else if (TNY_IS_FOLDER (current)) {
+		TnyAccount *account;
+		account = modest_tny_folder_get_account ((TnyFolder *) current);
+		if (account) {
+			if (modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (account)) ||
+			    modest_tny_account_is_memory_card_account (TNY_ACCOUNT (account))) {
+				visible_id = g_object_get_data ((GObject *) picker, FOLDER_PICKER_ORIGINAL_ACCOUNT);
+			} else {
+				visible_id = tny_account_get_id (account);
 			}
+			g_object_unref (account);
 		}
-	}
-
-	if (visible_id == NULL) {
-		visible_id = g_strdup (
-			modest_folder_view_get_account_id_of_visible_server_account (MODEST_FOLDER_VIEW(original)));
+	} else {
+		visible_id =
+			modest_folder_view_get_account_id_of_visible_server_account (MODEST_FOLDER_VIEW(original));
 	}
 
 	modest_folder_view_set_account_id_of_visible_server_account (MODEST_FOLDER_VIEW(folder_view),
 								     visible_id);
-	g_free (visible_id);
 
 	gtk_container_add (GTK_CONTAINER (GTK_DIALOG (userdata.dialog)->vbox), pannable);
 	gtk_container_add (GTK_CONTAINER (pannable), folder_view);
@@ -809,7 +814,7 @@ get_image_for_folder_store (TnyFolderStore *store,
 				icon_name = MODEST_FOLDER_ICON_INBOX;
 				break;
 			default:
-				icon_name = MODEST_FOLDER_ICON_ACCOUNT;
+				icon_name = MODEST_FOLDER_ICON_REMOTE_FOLDER;
 			}
 		} else if (modest_tny_folder_is_local_folder (TNY_FOLDER (store))) {
 			switch (type) {
@@ -917,7 +922,7 @@ folder_picker_clicked (GtkButton *button,
 
 	current = g_object_get_data (G_OBJECT (button), FOLDER_PICKER_CURRENT_FOLDER);
 
-	store = folder_chooser_dialog_run (helper->folder_view, current);
+	store = folder_chooser_dialog_run (helper->folder_view, current, button);
 	if (store) {
 		const gchar *current_name;
 		gboolean exists = FALSE;
@@ -943,15 +948,37 @@ static GtkWidget *
 folder_picker_new (TnyFolderStore *suggested, FolderPickerHelper *helper)
 {
 	GtkWidget *button;
+	const gchar *acc_id = NULL;
 
 	button = hildon_button_new (MODEST_EDITABLE_SIZE,
 				    HILDON_BUTTON_ARRANGEMENT_HORIZONTAL);
 
 	hildon_button_set_alignment (HILDON_BUTTON (button), 0.0, 0.5, 1.0, 1.0);
 
-	if (suggested)
+	if (suggested) {
+
 		folder_picker_set_store (GTK_BUTTON (button), suggested);
 
+		if (TNY_IS_ACCOUNT (suggested)) {
+			if (!modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (suggested)) &&
+			    !modest_tny_account_is_memory_card_account (TNY_ACCOUNT (suggested)))
+				acc_id = tny_account_get_id ((TnyAccount *) suggested);
+		} else {
+			TnyAccount *account = modest_tny_folder_get_account ((TnyFolder *) suggested);
+			if (account) {
+				acc_id = tny_account_get_id ((TnyAccount *) account);
+				g_object_unref (account);
+			}
+		}
+	}
+
+	if (!acc_id)
+		acc_id = modest_folder_view_get_account_id_of_visible_server_account (MODEST_FOLDER_VIEW(helper->folder_view));
+
+	g_object_set_data_full (G_OBJECT (button), FOLDER_PICKER_ORIGINAL_ACCOUNT,
+				g_strdup (acc_id), (GDestroyNotify) g_free);
+
+
 	g_signal_connect (G_OBJECT (button), "clicked",
 			  G_CALLBACK (folder_picker_clicked),
 			  helper);
@@ -1134,14 +1161,16 @@ modest_platform_run_new_folder_dialog (GtkWindow *parent_window,
 						    suggested_folder);
 
 	/* In hildon 2.2 we always suggest the archive folder as parent */
-	acc_store = modest_runtime_get_account_store ();
-	account = modest_tny_account_store_get_mmc_folders_account (acc_store);
-	if (account) {
-		suggested_folder = (TnyFolderStore *)
-			modest_tny_account_get_special_folder (account,
-							       TNY_FOLDER_TYPE_ARCHIVE);
-		g_object_unref (account);
-		account = NULL;
+	if (!suggested_folder) {
+		acc_store = modest_runtime_get_account_store ();
+		account = modest_tny_account_store_get_mmc_folders_account (acc_store);
+		if (account) {
+			suggested_folder = (TnyFolderStore *)
+				modest_tny_account_get_special_folder (account,
+								       TNY_FOLDER_TYPE_ARCHIVE);
+			g_object_unref (account);
+			account = NULL;
+		}
 	}
 
 	/* If there is not archive folder then fallback to local folders account */
@@ -1459,14 +1488,23 @@ modest_platform_set_update_interval (guint minutes)
 	ModestConf *conf = modest_runtime_get_conf ();
 	if (!conf)
 		return FALSE;
-		
+
+	if (minutes > 0) {
+		GSList *acc_names = modest_account_mgr_account_names (modest_runtime_get_account_mgr (), TRUE);
+		if (!acc_names) {
+			minutes = 0;
+		} else {
+			modest_account_mgr_free_account_names (acc_names);
+		}
+	}
+
 	cookie_t alarm_cookie = modest_conf_get_int (conf, MODEST_CONF_ALARM_ID, NULL);
 
 	/* Delete any existing alarm,
 	 * because we will replace it: */
 	if (alarm_cookie) {
 		if (alarmd_event_del(alarm_cookie) != 0)
-			g_warning ("%s: alarm %d was not on the queue", __FUNCTION__, (int)alarm_cookie);
+			g_debug ("%s: alarm %d was not on the queue", __FUNCTION__, (int)alarm_cookie);
 		alarm_cookie = 0;
 		modest_conf_set_int (conf, MODEST_CONF_ALARM_ID, 0, NULL);
 	}
@@ -1518,7 +1556,7 @@ modest_platform_set_update_interval (guint minutes)
 	
 	if (!alarm_cookie) {
 	    /* Error */
-	    g_debug ("Error setting alarm event. \n");
+	    g_warning ("Error setting alarm event. \n");
 	    
 	    return FALSE;
 	}
@@ -1561,111 +1599,113 @@ void
 modest_platform_on_new_headers_received (GList *URI_list,
 					 gboolean show_visual)
 {
-	if (g_list_length (URI_list) == 0)
+	gboolean screen_on, app_in_foreground;
+
+	/* Get the window status */
+	app_in_foreground = hildon_program_get_is_topmost (hildon_program_get_instance ());
+	screen_on = modest_window_mgr_screen_is_on (modest_runtime_get_window_mgr ());
+
+	/* If the screen is on and the app is in the
+	   foreground we don't show anything */
+	if (screen_on && app_in_foreground)
 		return;
 
-	/* If the window is in the foreground don't do anything */
-	if (hildon_program_get_is_topmost (hildon_program_get_instance ()))
+	if (g_list_length (URI_list) == 0)
 		return;
 
 #ifdef MODEST_HAVE_HILDON_NOTIFY
 	/* For any other case issue a notification */
 	HildonNotification *notification;
-	GList *iter;
-	GSList *notifications_list = NULL;
+	ModestMsgNotificationData *data;
+	gint notif_id;
+	gchar *from;
+	TnyAccountStore *acc_store;
+	TnyAccount *account;
 
-	/* Get previous notifications ids */
-	notifications_list = modest_conf_get_list (modest_runtime_get_conf (),
-						   MODEST_CONF_NOTIFICATION_IDS,
-						   MODEST_CONF_VALUE_INT, NULL);
-
-	iter = URI_list;
-	while (iter) {
-		ModestMsgNotificationData *data;
-		gboolean first_notification = TRUE;
-		gint notif_id;
-		gchar *from;
-
-		data = (ModestMsgNotificationData *) iter->data;
-
-		/* String is changed in-place. There is no need to
-		   actually dup the data->from string but we just do
-		   it in order not to modify the original contents */
-		from = g_strdup (data->from);
-		modest_text_utils_get_display_address (from);
-
-		notification = hildon_notification_new (from,
-							data->subject,
-							"qgn_list_messagin",
-							MODEST_NOTIFICATION_CATEGORY);
-		g_free (from);
-
-		hildon_notification_add_dbus_action(notification,
-						    "default",
-						    "Cancel",
-						    MODEST_DBUS_SERVICE,
-						    MODEST_DBUS_OBJECT,
-						    MODEST_DBUS_IFACE,
-						    MODEST_DBUS_METHOD_OPEN_MESSAGE,
-						    G_TYPE_STRING, data->uri,
-						    -1);
-
-		/* Play sound if the user wants. Show the LED
-		   pattern. Show and play just one */
-		if (G_UNLIKELY (first_notification)) {
-			TnyAccountStore *acc_store;
-			TnyAccount *account;
-
-			first_notification = FALSE;
-
-			/* Set the led pattern and make the notification persistent */
-			notify_notification_set_hint_int32 (NOTIFY_NOTIFICATION (notification),
-							    "dialog-type", 4);
-			notify_notification_set_hint_string(NOTIFY_NOTIFICATION (notification),
-							    "led-pattern",
-							    MODEST_NEW_MAIL_LIGHTING_PATTERN);
-			notify_notification_set_hint_byte (NOTIFY_NOTIFICATION (notification),
-							   "persistent", TRUE);
-
-			/* Set the account of the headers */
-			acc_store = (TnyAccountStore *) modest_runtime_get_account_store ();
-			account = tny_account_store_find_account (acc_store, data->uri);
-			if (account) {
-				const gchar *acc_name;
-				acc_name =
-					modest_tny_account_get_parent_modest_account_name_for_server_account (account);
-				notify_notification_set_hint_string(NOTIFY_NOTIFICATION (notification),
-								    "email-account",
-								    acc_name);
-				g_object_unref (account);
-			}
+	data = (ModestMsgNotificationData *) URI_list->data;
+
+	/* String is changed in-place. There is no need to
+	   actually dup the data->from string but we just do
+	   it in order not to modify the original contents */
+	from = g_strdup (data->from);
+	modest_text_utils_get_display_address (from);
+
+	/* Create notification */
+	notification = hildon_notification_new (from,
+						data->subject,
+						"qgn_list_messagin",
+						MODEST_NOTIFICATION_CATEGORY);
+	g_free (from);
+
+	/* Add DBus action */
+	hildon_notification_add_dbus_action(notification,
+					    "default",
+					    "Cancel",
+					    MODEST_DBUS_SERVICE,
+					    MODEST_DBUS_OBJECT,
+					    MODEST_DBUS_IFACE,
+					    MODEST_DBUS_METHOD_OPEN_MESSAGE,
+					    G_TYPE_STRING, data->uri,
+					    -1);
+
+	/* Set the led pattern */
+	if (data->time)
+		notify_notification_set_hint_int32 (NOTIFY_NOTIFICATION (notification),
+						    "time", data->time);
+
+	notify_notification_set_hint_int32 (NOTIFY_NOTIFICATION (notification),
+					    "dialog-type", 4);
+	notify_notification_set_hint_string(NOTIFY_NOTIFICATION (notification),
+					    "led-pattern",
+					    MODEST_NEW_MAIL_LIGHTING_PATTERN);
+
+	/* Make the notification persistent */
+	notify_notification_set_hint_byte (NOTIFY_NOTIFICATION (notification),
+					   "persistent", TRUE);
+
+	/* Set the number of new notifications */
+	notify_notification_set_hint_int32 (NOTIFY_NOTIFICATION (notification),
+					    "amount", g_list_length (URI_list));
+
+	/* Set the account of the headers */
+	acc_store = (TnyAccountStore *) modest_runtime_get_account_store ();
+	account = tny_account_store_find_account (acc_store, data->uri);
+	if (account) {
+		const gchar *acc_name;
+		acc_name =
+			modest_tny_account_get_parent_modest_account_name_for_server_account (account);
+		notify_notification_set_hint_string(NOTIFY_NOTIFICATION (notification),
+						    "email-account",
+						    acc_name);
+		g_object_unref (account);
+	}
 
-			/* Play sound */
-			modest_platform_play_email_tone ();
-		}
+	/* Play sound */
+	modest_platform_play_email_tone ();
+	if (notify_notification_show (NOTIFY_NOTIFICATION (notification), NULL)) {
+		GSList *notifications_list = NULL;
 
-		/* Notify. We need to do this in an idle because this function
-		   could be called from a thread */
-		if (!notify_notification_show (NOTIFY_NOTIFICATION (notification), NULL)) {
-			g_warning ("Failed to send notification");
-		}
+		/* Get previous notifications ids */
+		notifications_list = modest_conf_get_list (modest_runtime_get_conf (),
+							   MODEST_CONF_NOTIFICATION_IDS,
+							   MODEST_CONF_VALUE_INT, NULL);
 
 		/* Save id in the list */
-		g_object_get(G_OBJECT(notification), "id", &notif_id, NULL);
+		g_object_get(G_OBJECT (notification), "id", &notif_id, NULL);
 		notifications_list = g_slist_prepend (notifications_list, GINT_TO_POINTER(notif_id));
+
 		/* We don't listen for the "closed" signal, because we
 		   don't care about if the notification was removed or
 		   not to store the list in gconf */
 
-		/* Free & carry on */
-		iter = g_list_next (iter);
-	}
-
-	/* Save the ids */
-	modest_conf_set_list (modest_runtime_get_conf (), MODEST_CONF_NOTIFICATION_IDS, 
-			      notifications_list, MODEST_CONF_VALUE_INT, NULL);
+		/* Save the ids */
+		modest_conf_set_list (modest_runtime_get_conf (), MODEST_CONF_NOTIFICATION_IDS,
+				      notifications_list, MODEST_CONF_VALUE_INT, NULL);
 
-	g_slist_free (notifications_list);
+		g_slist_free (notifications_list);
+	} else {
+		g_warning ("Failed to send notification");
+	}
 
 #endif /*MODEST_HAVE_HILDON_NOTIFY*/
 }
@@ -1776,11 +1816,6 @@ modest_platform_create_folder_view_full (TnyFolderStoreQuery *query, gboolean do
 	modest_folder_view_set_style (MODEST_FOLDER_VIEW (widget),
 				      MODEST_FOLDER_VIEW_STYLE_SHOW_ONE);
 
-	/* Restore settings */
-	modest_widget_memory_restore (modest_runtime_get_conf(), 
-				      G_OBJECT (widget),
-				      MODEST_CONF_FOLDER_VIEW_KEY);
-
 	return widget;
 }
 
@@ -1803,7 +1838,7 @@ modest_platform_information_banner (GtkWidget *parent,
 				    const gchar *icon_name,
 				    const gchar *text)
 {
-	GtkWidget *banner, *banner_parent = NULL;
+	GtkWidget *banner_parent = NULL;
 	ModestWindowMgr *mgr = modest_runtime_get_window_mgr ();
 
 	if (modest_window_mgr_get_num_windows (mgr) == 0)
@@ -1826,8 +1861,23 @@ modest_platform_information_banner (GtkWidget *parent,
 			return;
 	}
 
+	modest_platform_system_banner (banner_parent, icon_name, text);
+}
 
-	banner = hildon_banner_show_information (banner_parent, icon_name, text);
+void 
+modest_platform_system_banner (GtkWidget *parent,
+			       const gchar *icon_name,
+			       const gchar *text)
+{
+	GtkWidget *banner = NULL;
+	ModestWindowMgr *mgr = modest_runtime_get_window_mgr ();
+
+	if (parent && GTK_IS_WINDOW (parent)) {
+		if (!gtk_window_is_active (GTK_WINDOW (parent)))
+			parent = NULL;
+	}
+
+	banner = hildon_banner_show_information (parent, icon_name, text);
 
 	modest_window_mgr_register_banner (mgr);
 	g_object_ref (mgr);
@@ -2011,8 +2061,8 @@ modest_platform_run_certificate_confirmation_dialog (const gchar* server_name,
 	win = MODEST_WINDOW (hildon_window_stack_peek (stack));
 
 	if (!win) {
-	  g_warning ("%s: don't show dialogs if there's no window shown; assuming 'Cancel'",
-			   __FUNCTION__);
+		g_debug ("%s: don't show dialogs if there's no window shown; assuming 'Cancel'",
+			 __FUNCTION__);
 		return FALSE;
 	}
 
@@ -2024,14 +2074,17 @@ modest_platform_run_certificate_confirmation_dialog (const gchar* server_name,
 	   example. With GTK_RESPONSE_HELP the view button is aligned
 	   to the left while the other two to the right */
 	note = hildon_note_new_confirmation_add_buttons  (
-		NULL,
+		(GtkWindow *) win,
 		question,
 		_HL("wdgt_bd_yes"),     GTK_RESPONSE_OK,
 		_HL("wdgt_bd_view"),          GTK_RESPONSE_APPLY,   /* abusing this... */
 		_HL("wdgt_bd_no"), GTK_RESPONSE_CANCEL,
 		NULL, NULL);
 
-	g_signal_connect (G_OBJECT(note), "response", 
+	modest_window_mgr_set_modal (modest_runtime_get_window_mgr (),
+				     (GtkWindow *) note, (GtkWindow *) win);
+
+	g_signal_connect (G_OBJECT(note), "response",
 			  G_CALLBACK(on_cert_dialog_response),
 			  (gpointer) certificate);
 
@@ -2054,8 +2107,8 @@ modest_platform_run_alert_dialog (const gchar* prompt,
 	top_win = MODEST_WINDOW (hildon_window_stack_peek (stack));
 
 	if (!top_win) {
-		g_warning ("%s: don't show dialogs if there's no window shown; assuming 'Cancel'",
-			   __FUNCTION__);
+		g_debug ("%s: don't show dialogs if there's no window shown; assuming 'Cancel'",
+			 __FUNCTION__);
 		return FALSE;
 	}
 
@@ -2574,7 +2627,6 @@ modest_platform_play_email_tone (void)
 	gchar *mail_tone;
 	gint mail_volume_int;
 	int ret;
-	ca_context *ca_con = NULL;
 	ca_proplist *pl = NULL;
 
 #ifdef MODEST_USE_PROFILE
@@ -2602,14 +2654,15 @@ modest_platform_play_email_tone (void)
 
 	if (mail_volume_int > 0) {
 
-		if ((ret = ca_context_create(&ca_con)) != CA_SUCCESS) {
-			g_warning("ca_context_create: %s\n", ca_strerror(ret));
-			return;
+		if (ca_con == NULL) {
+			if ((ret = ca_context_create (&ca_con)) != CA_SUCCESS) {
+				g_warning("ca_context_create: %s\n", ca_strerror(ret));
+				return;
+			}
 		}
 
 		if ((ret = ca_context_open(ca_con)) != CA_SUCCESS) {
 			g_warning("ca_context_open: %s\n", ca_strerror(ret));
-			ca_context_destroy(ca_con);
 			return;
 		}
 
@@ -2621,7 +2674,6 @@ modest_platform_play_email_tone (void)
 		g_debug("ca_context_play_full (vol %f): %s\n", (gfloat) mail_volume_int, ca_strerror(ret));
 
 		ca_proplist_destroy(pl);
-		ca_context_destroy(ca_con);
 	}
 
 	g_free (mail_tone);
@@ -2635,6 +2687,52 @@ modest_platform_play_email_tone (void)
 #define MOVE_TO_FOLDER_SEPARATOR "/"
 
 static void
+translate_path (gchar **path)
+{
+	gchar **parts;
+	gchar **current;
+	GString *output;
+	gboolean add_separator;
+
+	parts = g_strsplit (*path, MOVE_TO_FOLDER_SEPARATOR, 0);
+	g_free (*path);
+
+	current = parts;
+	output = g_string_new ("");
+	add_separator = FALSE;
+
+	while (*current != NULL) {
+		TnyFolderType folder_type;
+		gchar *downcase;
+
+		if (add_separator) {
+			output = g_string_append (output, MOVE_TO_FOLDER_SEPARATOR);
+		} else {
+			add_separator = TRUE;
+		}
+
+		downcase = g_ascii_strdown (*current, -1);
+		folder_type = modest_local_folder_info_get_type (downcase);
+		if (strcmp (downcase, "inbox") == 0) {
+			output = g_string_append (output, _("mcen_me_folder_inbox"));
+		} else if (folder_type == TNY_FOLDER_TYPE_ARCHIVE ||
+		    folder_type == TNY_FOLDER_TYPE_DRAFTS ||
+		    folder_type == TNY_FOLDER_TYPE_SENT ||
+		    folder_type == TNY_FOLDER_TYPE_OUTBOX) {
+			output = g_string_append (output, modest_local_folder_info_get_type_display_name (folder_type));
+		} else {
+			output = g_string_append (output, *current);
+		}
+		g_free (downcase);
+
+		current++;
+	}
+
+	g_strfreev (parts);
+	*path = g_string_free (output, FALSE);
+}
+
+static void
 move_to_dialog_set_selected_folder_store (GtkWidget *dialog, 
 					  TnyFolderStore *folder_store)
 {
@@ -2684,6 +2782,7 @@ move_to_dialog_set_selected_folder_store (GtkWidget *dialog,
 						 short_name,
 						 NULL);
 		}
+		translate_path (&full_name);
 		hildon_button_set_value (HILDON_BUTTON (action_button), full_name);
 		g_free (full_name);
 	}
@@ -2834,7 +2933,7 @@ on_move_to_dialog_row_activated (GtkTreeView       *tree_view,
 			valid  = !modest_protocol_registry_protocol_type_has_tag 
 				(modest_runtime_get_protocol_registry (),
 				 protocol_type,
-				 MODEST_PROTOCOL_REGISTRY_STORE_FORBID_MESSAGE_ADD);
+				 MODEST_PROTOCOL_REGISTRY_STORE_FORBID_INCOMING_XFERS);
 		}
 		if (valid)
 			move_to_dialog_show_folders (dialog, selected);
@@ -2883,7 +2982,14 @@ on_move_to_dialog_action_clicked (GtkButton *selection,
 		selected = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
 
 		if (selected) {
-			gtk_dialog_response  (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+			/* It's not possible to select root folders as
+			   targets unless they're the local account or
+			   the memory card account */
+			if ((TNY_IS_FOLDER (selected) && !TNY_IS_MERGE_FOLDER (selected)) ||
+			    (TNY_IS_ACCOUNT (selected) &&
+			     (modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (selected)) ||
+			      modest_tny_account_is_memory_card_account (TNY_ACCOUNT (selected)))))
+				gtk_dialog_response  (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
 			g_object_unref (selected);
 		}
 	}