X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-platform.c;h=cf31c38b896554a1a3a70a73d90dc0fc85dd95fe;hp=c1f43f19d9ae3f67c8566a6184f9c847d92a81b9;hb=fcbc6a6dfa1a10921d2ca889256a21b192adbe98;hpb=559eb056f86c05494e9c6c657c11a09ab9b78cc4

diff --git a/src/maemo/modest-platform.c b/src/maemo/modest-platform.c
index c1f43f1..cf31c38 100644
--- a/src/maemo/modest-platform.c
+++ b/src/maemo/modest-platform.c
@@ -34,26 +34,51 @@
 #include <modest-main-window.h>
 #include <modest-header-view.h>
 #include "maemo/modest-maemo-global-settings-dialog.h"
-
+#include "modest-widget-memory.h"
 #include <modest-hildon-includes.h>
-
+#include <osso-helplib.h>
 #include <dbus_api/modest-dbus-callbacks.h>
+#include <libosso-abook/osso-abook.h>
 #include <maemo/modest-osso-autosave-callbacks.h>
 #include <libosso.h>
 #include <alarmd/alarm_event.h> /* For alarm_event_add(), etc. */
 #include <tny-maemo-conic-device.h>
+#include <tny-simple-list.h>
 #include <tny-folder.h>
+#include <tny-camel-imap-store-account.h>
+#include <tny-camel-pop-store-account.h>
 #include <gtk/gtkicontheme.h>
 #include <gtk/gtkmenuitem.h>
 #include <gtk/gtkmain.h>
+#include <modest-text-utils.h>
 #include <string.h>
 
+
+#define HILDON_OSSO_URI_ACTION "uri-action"
+#define URI_ACTION_COPY "copy:"
+
 static osso_context_t *osso_context = NULL;
-	
+
+static void	
+on_modest_conf_update_interval_changed (ModestConf* self, 
+					const gchar *key, 
+					ModestConfEvent event,
+					ModestConfNotificationId id, 
+					gpointer user_data)
+{
+	if (strcmp (key, MODEST_CONF_UPDATE_INTERVAL) == 0) {
+		const guint update_interval_minutes = 
+			modest_conf_get_int (self, MODEST_CONF_UPDATE_INTERVAL, NULL);
+		modest_platform_set_update_interval (update_interval_minutes);
+	}
+}
+
 gboolean
-modest_platform_init (void)
+modest_platform_init (int argc, char *argv[])
 {
-	osso_hw_state_t hw_state = { 0 };	
+	osso_hw_state_t hw_state = { 0 };
+	DBusConnection *con;	
+
 	osso_context =
 		osso_initialize(PACKAGE,PACKAGE_VERSION,
 				FALSE, NULL);	
@@ -62,15 +87,35 @@ modest_platform_init (void)
 		return FALSE;
 	}
 
-	/* Register our D-Bus callbacks, via the osso API: */
+	if ((con = osso_get_dbus_connection (osso_context)) == NULL) {
+		g_printerr ("modest: could not get dbus connection\n");
+		return FALSE;
+
+	}
+	
+	/* Add a D-Bus handler to be used when the main osso-rpc 
+	 * D-Bus handler has not handled something.
+	 * We use this for D-Bus methods that need to use more complex types 
+	 * than osso-rpc supports. 
+	 */
+	if (!dbus_connection_add_filter (con,
+					 modest_dbus_req_filter,
+					 NULL,
+					 NULL)) {
+
+		g_printerr ("modest: Could not add D-Bus filter\n");
+		return FALSE;
+	}
+
+	/* Register our simple D-Bus callbacks, via the osso API: */
 	osso_return_t result = osso_rpc_set_cb_f(osso_context, 
                                MODEST_DBUS_SERVICE, 
                                MODEST_DBUS_OBJECT, 
                                MODEST_DBUS_IFACE,
                                modest_dbus_req_handler, NULL /* user_data */);
     	if (result != OSSO_OK) {
-       		g_print("Error setting D-BUS callback (%d)\n", result);
-       		return OSSO_ERROR;
+       		g_printerr ("modest: Error setting D-BUS callback (%d)\n", result);
+       		return FALSE;
    	}
 
 	/* Add handler for Exit D-BUS messages.
@@ -92,16 +137,35 @@ modest_platform_init (void)
 	result = osso_application_set_autosave_cb (osso_context, 
 		modest_on_osso_application_autosave, NULL /* user_data */);
 	if (result != OSSO_OK) {
-		g_warning ("osso_application_set_autosave_cb() failed.");	
+		g_printerr ("modest: osso_application_set_autosave_cb() failed.\n");
+		return FALSE;
 	}
 	
-	
-	/* TODO: Get the actual update interval from gconf, 
-	 * when that preferences dialog has been implemented.
-	 * And make sure that this is called again whenever that is changed. */
-	const guint update_interval_minutes = 15;
-	modest_platform_set_update_interval (update_interval_minutes);
-	
+
+	/* Make sure that the update interval is changed whenever its gconf key 
+	 * is changed */
+	/* CAUTION: we're not using here the
+	   modest_conf_listen_to_namespace because we know that there
+	   are other parts of Modest listening for this namespace, so
+	   we'll receive the notifications anyway. We basically do not
+	   use it because there is no easy way to do the
+	   modest_conf_forget_namespace */
+	ModestConf *conf = modest_runtime_get_conf ();
+	g_signal_connect (G_OBJECT(conf),
+			  "key_changed",
+			  G_CALLBACK (on_modest_conf_update_interval_changed), 
+			  NULL);
+			  
+	/* Get the initial update interval from gconf: */
+	on_modest_conf_update_interval_changed(conf, MODEST_CONF_UPDATE_INTERVAL,
+					       MODEST_CONF_EVENT_KEY_CHANGED, 0, NULL);
+
+	/* initialize the addressbook */
+	if (!osso_abook_init (&argc, &argv, osso_context)) {
+		g_printerr ("modest: failed to initialized addressbook\n");
+		return FALSE;
+	}
+		
 	return TRUE;
 }
 
@@ -137,7 +201,7 @@ guess_mime_type_from_name (const gchar* name)
 		return octet_stream;
 	
 	for (i = 0; i != G_N_ELEMENTS(mime_map); ++i) {
-		if (g_ascii_strcasecmp (mime_map[i][0], ext + 1)) /* +1: ignore '.'*/
+		if (!g_ascii_strcasecmp (mime_map[i][0], ext + 1)) /* +1: ignore '.'*/
 			return mime_map[i][1];
 	}
 	return octet_stream;
@@ -146,28 +210,30 @@ guess_mime_type_from_name (const gchar* name)
 
 gchar*
 modest_platform_get_file_icon_name (const gchar* name, const gchar* mime_type,
-					  gchar **effective_mime_type)
+				    gchar **effective_mime_type)
 {
 	GString *mime_str = NULL;
 	gchar *icon_name  = NULL;
 	gchar **icons, **cursor;
-	
-	
-	g_return_val_if_fail (name || mime_type, NULL);
 
-	if (!mime_type || g_ascii_strcasecmp (mime_type, "application/octet-stream")) 
+	if (!mime_type || !g_ascii_strcasecmp (mime_type, "application/octet-stream")) 
 		mime_str = g_string_new (guess_mime_type_from_name(name));
 	else {
 		mime_str = g_string_new (mime_type);
 		g_string_ascii_down (mime_str);
 	}
-#ifdef MODEST_HILDON_VERSION_0
+
+#ifdef MODEST_HAVE_OSSO_MIME
 	icons = osso_mime_get_icon_names (mime_str->str, NULL);
 #else
 	icons = hildon_mime_get_icon_names (mime_str->str, NULL);
-#endif /*MODEST_HILDON_VERSION_0*/
+#endif /*MODEST_HAVE_OSSO_MIME*/
 	for (cursor = icons; cursor; ++cursor) {
-		if (gtk_icon_theme_has_icon (gtk_icon_theme_get_default(), *cursor)) {
+		if (!g_ascii_strcasecmp (*cursor, "gnome-mime-message") ||
+		    !g_ascii_strcasecmp (*cursor, "gnome-mime-message-rfc822")) {
+			icon_name = g_strdup ("qgn_list_messagin");
+			break;
+		} else if (gtk_icon_theme_has_icon (gtk_icon_theme_get_default(), *cursor)) {
 			icon_name = g_strdup (*cursor);
 			break;
 		}
@@ -182,51 +248,127 @@ modest_platform_get_file_icon_name (const gchar* name, const gchar* mime_type,
 	return icon_name;
 }
 
+
+
+
+#ifdef MODEST_HAVE_OSSO_MIME
 gboolean 
 modest_platform_activate_uri (const gchar *uri)
 {
-	gboolean result;
+	OssoURIAction *action;
+	gboolean result = FALSE;
+	GSList *actions, *iter = NULL;
+	const gchar *scheme;
+	
+	g_return_val_if_fail (uri, FALSE);
+	if (!uri)
+		return FALSE;
 
-#ifdef MODEST_HILDON_VERSION_0
-	result = osso_uri_open (uri, NULL, NULL);
-#else
-	result = hildon_uri_open (uri, NULL, NULL);
-#endif
+	/* the default action should be email */
+	scheme = osso_uri_get_scheme_from_uri (uri, NULL);
+	actions = osso_uri_get_actions (scheme, NULL);
+	
+	for (iter = actions; iter; iter = g_slist_next (iter)) {
+		action = (OssoURIAction*) iter->data;
+		if (action && strcmp (osso_uri_action_get_name (action), "uri_link_compose_email") == 0) {
+			GError *err = NULL;
+			result = osso_uri_open (uri, action, &err);
+			if (!result && err) {
+				g_printerr ("modest: modest_platform_activate_uri : %s",
+					    err->message ? err->message : "unknown error");
+				g_error_free (err);
+			}
+			break;
+		}
+	}
 
+	/* if we could open it with email, try something else */
+	if (!result)
+	       	result = osso_uri_open (uri, NULL, NULL);	
+	
+			
 	if (!result)
 		hildon_banner_show_information (NULL, NULL, _("mcen_ib_unsupported_link"));
 	return result;
 }
 
+#else /* !MODEST_HAVE_OSSO_MIME*/
+
 gboolean 
-modest_platform_activate_file (const gchar *path)
+modest_platform_activate_uri (const gchar *uri)
+{
+	HildonURIAction *action;
+	gboolean result = FALSE;
+	GSList *actions, *iter = NULL;
+	const gchar *scheme;
+	
+	g_return_val_if_fail (uri, FALSE);
+	if (!uri)
+		return FALSE;
+
+	scheme = hildon_uri_get_scheme_from_uri (uri, NULL);
+	actions = hildon_uri_get_actions (scheme, NULL);
+	
+	for (iter = actions; iter; iter = g_slist_next (iter)) {
+		action = (HildonURIAction*) iter->data;
+		if (action && strcmp (hildon_uri_action_get_service (action), "com.nokia.modest") == 0) {
+			GError *err = NULL;
+			result = hildon_uri_open (uri, action, &err);
+			if (!result && err) {
+				g_printerr ("modest: modest_platform_activate_uri : %s",
+					    err->message ? err->message : "unknown error");
+				g_error_free (err);
+			}
+			break;
+		}
+	}
+	
+	/* if we could open it with email, try something else */
+	if (!result)
+	       	result = hildon_uri_open (uri, NULL, NULL);	
+		
+	if (!result)
+		hildon_banner_show_information (NULL, NULL, _("mcen_ib_unsupported_link"));
+	
+	return result;
+}
+
+
+#endif /* MODEST_HAVE_OSSO_MIME*/
+
+gboolean 
+modest_platform_activate_file (const gchar *path, const gchar *mime_type)
 {
 	gint result;
 	DBusConnection *con;
 	gchar *uri_path = NULL;
+	GString *mime_str = NULL;
+
+	if (!mime_type || !g_ascii_strcasecmp (mime_type, "application/octet-stream")) 
+		mime_str = g_string_new (guess_mime_type_from_name(path));
+	else {
+		mime_str = g_string_new (mime_type);
+		g_string_ascii_down (mime_str);
+	}
 
 	uri_path = g_strconcat ("file://", path, NULL);
 	
 	con = osso_get_dbus_connection (osso_context);
-#ifdef MODEST_HILDON_VERSION_0
-	result = osso_mime_open_file (con, uri_path);
-
-	if (result != 1)
-		hildon_banner_show_information (NULL, NULL, _("mcen_ni_noregistered_viewer"));
-	return result != 1;
+#ifdef MODEST_HAVE_OSSO_MIME
+	result = osso_mime_open_file_with_mime_type (con, uri_path, mime_str->str);
 #else
-	result = hildon_mime_open_file (con, uri_path);
+	result = hildon_mime_open_file_with_mime_type (con, uri_path, mime_str->str);
+#endif /*MODEST_HAVE_OSSO_MIME*/
+	g_string_free (mime_str, TRUE);
 
 	if (result != 1)
-		hildon_banner_show_information (NULL, NULL, _("mcen_ni_noregistered_viewer"));
+		modest_platform_run_information_dialog (NULL, _("mcen_ni_noregistered_viewer"));
 	return result != 1;
-#endif
-
 }
 
 typedef struct  {
-	GSList * actions;
-	gchar *uri;
+	GSList *actions;
+	gchar  *uri;
 } ModestPlatformPopupInfo;
 
 static gboolean
@@ -237,11 +379,11 @@ delete_uri_popup (GtkWidget *menu,
 	ModestPlatformPopupInfo *popup_info = (ModestPlatformPopupInfo *) userdata;
 
 	g_free (popup_info->uri);
-#ifdef MODEST_HILDON_VERSION_0
+#ifdef MODEST_HAVE_OSSO_MIME
 	osso_uri_free_actions (popup_info->actions);
 #else
 	hildon_uri_free_actions (popup_info->actions);
-#endif
+#endif /*MODEST_HAVE_OSSO_MIME*/
 	return FALSE;
 }
 
@@ -251,24 +393,42 @@ activate_uri_popup_item (GtkMenuItem *menu_item,
 {
 	GSList *node;
 	ModestPlatformPopupInfo *popup_info = (ModestPlatformPopupInfo *) userdata;
-	GtkWidget *label;
+	const gchar* action_name;
+
+	action_name = g_object_get_data (G_OBJECT(menu_item), HILDON_OSSO_URI_ACTION);
+	if (!action_name) {
+		g_printerr ("modest: no action name defined\n");
+		return;
+	}
 
-	label = gtk_bin_get_child (GTK_BIN (menu_item));
+	/* special handling for the copy menu item -- copy the uri to the clipboard */
+	/* if it's a copy thingy, the uri will look like 'copy:http://slashdot.org' */
+	if (g_str_has_prefix (action_name, URI_ACTION_COPY)) {
+		GtkClipboard *clipboard = gtk_clipboard_get (GDK_NONE);
+		action_name += strlen(URI_ACTION_COPY); /* jump past the prefix */
 
+		if (g_str_has_prefix (action_name, "mailto:")) /* ignore mailto: prefixes */
+			action_name += strlen ("mailto:");
+		
+		gtk_clipboard_set_text (clipboard, action_name, strlen (action_name));
+		return; /* we're done */
+	}
+	
+	/* now, the real uri-actions... */
 	for (node = popup_info->actions; node != NULL; node = g_slist_next (node)) {
-#ifdef MODEST_HILDON_VERSION_0
+#ifdef MODEST_HAVE_OSSO_MIME
 		OssoURIAction *action = (OssoURIAction *) node->data;
-		if (strcmp (gtk_label_get_text (GTK_LABEL(label)), osso_uri_action_get_name (action))==0) {
+		if (strcmp (action_name, osso_uri_action_get_name (action))==0) {
 			osso_uri_open (popup_info->uri, action, NULL);
 			break;
 		}
 #else
 		HildonURIAction *action = (HildonURIAction *) node->data;
-		if (strcmp (gtk_label_get_text (GTK_LABEL(label)), hildon_uri_action_get_name (action))==0) {
+		if (strcmp (action_name, hildon_uri_action_get_name (action))==0) {
 			hildon_uri_open (popup_info->uri, action, NULL);
 			break;
 		}
-#endif
+#endif /*MODEST_HAVE_OSSO_MIME*/
 	}
 }
 
@@ -280,13 +440,14 @@ modest_platform_show_uri_popup (const gchar *uri)
 
 	if (uri == NULL)
 		return FALSE;
-#ifdef MODEST_HILDON_VERSION_0
+	
+#ifdef MODEST_HAVE_OSSO_MIME
 	scheme = osso_uri_get_scheme_from_uri (uri, NULL);
 	actions_list = osso_uri_get_actions (scheme, NULL);
 #else
 	scheme = hildon_uri_get_scheme_from_uri (uri, NULL);
 	actions_list = hildon_uri_get_actions (scheme, NULL);
-#endif
+#endif /* MODEST_HAVE_OSSO_MIME */
 	if (actions_list != NULL) {
 		GSList *node;
 		GtkWidget *menu = gtk_menu_new ();
@@ -297,13 +458,17 @@ modest_platform_show_uri_popup (const gchar *uri)
 	      
 		for (node = actions_list; node != NULL; node = g_slist_next (node)) {
 			GtkWidget *menu_item;
-
-#ifdef MODEST_HILDON_VERSION_0
-			OssoURIAction *action;
-
-			action = (OssoURIAction *) node->data;
-			menu_item = gtk_menu_item_new_with_label (osso_uri_action_get_name (action));
-			g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (activate_uri_popup_item), popup_info);
+			const gchar *action_name;
+			const gchar *translation_domain;
+#ifdef MODEST_HAVE_OSSO_MIME
+			OssoURIAction *action = (OssoURIAction *) node->data;
+			action_name = osso_uri_action_get_name (action);
+			translation_domain = osso_uri_action_get_translation_domain (action);
+			menu_item = gtk_menu_item_new_with_label (dgettext(translation_domain,action_name));
+			g_object_set_data (G_OBJECT(menu_item), HILDON_OSSO_URI_ACTION, (gpointer)action_name);
+			/* hack, we add it as a gobject property*/
+			g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (activate_uri_popup_item),
+					  popup_info);
 			
 			if (osso_uri_is_default_action (action, NULL)) {
 				gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menu_item);
@@ -311,28 +476,41 @@ modest_platform_show_uri_popup (const gchar *uri)
 				gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
 			}
 #else
-			HildonURIAction *action;
-
-			action = (HildonURIAction *) node->data;
-			menu_item = gtk_menu_item_new_with_label (hildon_uri_action_get_name (action));
-			g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (activate_uri_popup_item), popup_info);
-			
+			HildonURIAction *action = (HildonURIAction *) node->data;
+			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));
+			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);
+								  
 			if (hildon_uri_is_default_action (action, NULL)) {
 				gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menu_item);
 			} else {
 				gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
 			}
-#endif
-
+#endif /*MODEST_HAVE_OSSO_MIME*/
 			gtk_widget_show (menu_item);
 		}
+
+		/* always add the copy item */
+		GtkWidget* menu_item = gtk_menu_item_new_with_label (dgettext("osso-uri", "uri_link_copy_link_location"));
+		g_object_set_data_full (G_OBJECT(menu_item), HILDON_OSSO_URI_ACTION,
+					g_strconcat (URI_ACTION_COPY, uri, NULL),
+					g_free);
+		g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (activate_uri_popup_item),NULL);
+		gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
+		gtk_widget_show (menu_item);
+
+		
+		/* and what to do when the link is deleted */
 		g_signal_connect (G_OBJECT (menu), "delete-event", G_CALLBACK (delete_uri_popup), popup_info);
 		gtk_menu_popup (GTK_MENU(menu), NULL, NULL, NULL, NULL, 1, gtk_get_current_event_time ());
 						  
 	} else {
 		hildon_banner_show_information (NULL, NULL, _("mcen_ib_unsupported_link"));
 	}
-		
+	
 	g_free (scheme);
 	return TRUE;
 }
@@ -346,7 +524,14 @@ modest_platform_get_icon (const gchar *name)
 	GtkIconTheme *current_theme = NULL;
 
 	g_return_val_if_fail (name, NULL);
+
+	/* strlen == 0 is not really an error; it just
+	 * means the icon is not available
+	 */
+	if (!name || strlen(name) == 0)
+		return NULL;
 	
+#if 0 /* do we still need this? */
 	if (g_str_has_suffix (name, ".png")) { /*FIXME: hack*/
 		pixbuf = gdk_pixbuf_new_from_file (name, &err);
 		if (!pixbuf) {
@@ -357,7 +542,7 @@ modest_platform_get_icon (const gchar *name)
 		}
 		return pixbuf;
 	}
-
+#endif /* */
 	current_theme = gtk_icon_theme_get_default ();
 	pixbuf = gtk_icon_theme_load_icon (current_theme, name, 26,
 					   GTK_ICON_LOOKUP_NO_SVG,
@@ -387,33 +572,32 @@ entry_insert_text (GtkEditable *editable,
 	gint chars_length;
 
 	chars = gtk_editable_get_chars (editable, 0, -1);
-	chars_length = strlen (chars);
+	chars_length = g_utf8_strlen (chars, -1);
 
 	/* Show WID-INF036 */
-	if (chars_length == 20) {
+	if (chars_length >= 20) {
 		hildon_banner_show_information  (gtk_widget_get_parent (GTK_WIDGET (data)), NULL,
-						 _("mcen_ib_maxchar_reached"));
+						 _CS("ckdg_ib_maximum_characters_reached"));
 	} else {
-		if (chars_length == 0) {
-			/* A blank space is not valid as first character */
-			if (strcmp (text, " ")) {
-				GtkWidget *ok_button;
-				GList *buttons;
-
-				/* Show OK button */
-				buttons = gtk_container_get_children (GTK_CONTAINER (GTK_DIALOG (data)->action_area));
-				ok_button = GTK_WIDGET (buttons->next->data);
-				gtk_widget_set_sensitive (ok_button, TRUE);
-				g_list_free (buttons);
-			}
+		if (modest_text_utils_is_forbidden_char (*text, FOLDER_NAME_FORBIDDEN_CHARS)) {
+			/* Show an error */
+			gchar *tmp, *msg;
+			
+			tmp = g_strndup (folder_name_forbidden_chars, 
+					 FOLDER_NAME_FORBIDDEN_CHARS_LENGTH);
+			msg = g_strdup_printf (_CS("ckdg_ib_illegal_characters_entered"), tmp);
+			hildon_banner_show_information  (gtk_widget_get_parent (GTK_WIDGET (data)), 
+							 NULL, msg);
+			g_free (msg);
+			g_free (tmp);
+		} else {	
+			/* Write the text in the entry if it's valid */
+			g_signal_handlers_block_by_func (editable,
+							 (gpointer) entry_insert_text, data);
+			gtk_editable_insert_text (editable, text, length, position);
+			g_signal_handlers_unblock_by_func (editable,
+							   (gpointer) entry_insert_text, data);
 		}
-
-		/* Write the text in the entry */
-		g_signal_handlers_block_by_func (editable,
-						 (gpointer) entry_insert_text, data);
-		gtk_editable_insert_text (editable, text, length, position);
-		g_signal_handlers_unblock_by_func (editable,
-						   (gpointer) entry_insert_text, data);
 	}
 	/* Do not allow further processing */
 	g_signal_stop_emission_by_name (editable, "insert_text");
@@ -424,20 +608,24 @@ entry_changed (GtkEditable *editable,
 	       gpointer     user_data)
 {
 	gchar *chars;
+	GtkWidget *ok_button;
+	GList *buttons;
 
+	buttons = gtk_container_get_children (GTK_CONTAINER (GTK_DIALOG (user_data)->action_area));
+	ok_button = GTK_WIDGET (buttons->next->data);
+	
 	chars = gtk_editable_get_chars (editable, 0, -1);
+	g_return_if_fail (chars != NULL);
 
-	/* Dimm OK button */
-	if (strlen (chars) == 0) {
-		GtkWidget *ok_button;
-		GList *buttons;
-
-		buttons = gtk_container_get_children (GTK_CONTAINER (GTK_DIALOG (user_data)->action_area));
-		ok_button = GTK_WIDGET (buttons->next->data);
-		gtk_widget_set_sensitive (ok_button, FALSE);
-
-		g_list_free (buttons);
-	}
+	
+	if (g_utf8_strlen (chars,-1) >= 21)
+		hildon_banner_show_information  (gtk_widget_get_parent (GTK_WIDGET (user_data)), NULL,
+						 _CS("ckdg_ib_maximum_characters_reached"));
+	else
+		gtk_widget_set_sensitive (ok_button, modest_text_utils_validate_folder_name(chars));
+		
+	/* Free */
+	g_list_free (buttons);
 	g_free (chars);
 }
 
@@ -447,11 +635,16 @@ launch_sort_headers_dialog (GtkWindow *parent_window,
 {
 	ModestHeaderView *header_view = NULL;
 	GList *cols = NULL;
-	GList *tmp = NULL;
 	GtkSortType sort_type;
 	gint sort_key;
 	gint default_key = 0;
 	gint result;
+	gboolean outgoing = FALSE;
+	gint current_sort_colid = -1;
+	GtkSortType current_sort_type;
+	gint attachments_sort_id;
+	gint priority_sort_id;
+	GtkTreeSortable *sortable;
 	
 	/* Get header window */
 	if (MODEST_IS_MAIN_WINDOW (parent_window)) {
@@ -461,104 +654,126 @@ launch_sort_headers_dialog (GtkWindow *parent_window,
 	if (!header_view) return;
 
 	/* Add sorting keys */
-	cols = modest_header_view_get_columns (header_view);	
+	cols = modest_header_view_get_columns (header_view);
 	if (cols == NULL) return;
-	int num_cols = g_list_length(cols);
-	int sort_ids[num_cols];
-	int sort_model_ids[num_cols];
-	GtkTreeViewColumn *sort_cols[num_cols];
-	for (tmp=cols; tmp; tmp=tmp->next) {
-		gint col_id = GPOINTER_TO_INT (g_object_get_data(G_OBJECT(tmp->data), MODEST_HEADER_VIEW_COLUMN));
-		switch (col_id) {
-		case MODEST_HEADER_VIEW_COLUMN_COMPACT_FLAG:
-			sort_key = hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_attachment"));
-			sort_ids[sort_key] = col_id;
-			sort_model_ids[sort_key] = TNY_HEADER_FLAG_ATTACHMENTS;
-			sort_cols[sort_key] = tmp->data;
-
-			sort_key = hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_priority"));
-			sort_ids[sort_key] = col_id;
-			sort_model_ids[sort_key] = TNY_HEADER_FLAG_PRIORITY;
-			sort_cols[sort_key] = tmp->data;
-			break;
-		case MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT:
-			sort_key = hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_sender_recipient"));
-			sort_ids[sort_key] = col_id;
-			sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_TO_COLUMN;
-			sort_cols[sort_key] = tmp->data;
-
-			sort_key = hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_subject"));
-			sort_ids[sort_key] = col_id;
-			sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_SUBJECT_COLUMN;
-			sort_cols[sort_key] = tmp->data;
-			break;
-		case MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_IN:
-			sort_key = hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_sender_recipient"));
-			sort_ids[sort_key] = col_id;
-			sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN;
-			sort_cols[sort_key] = tmp->data;
-
-			sort_key = hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_subject"));
-			sort_ids[sort_key] = col_id;
-			sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_SUBJECT_COLUMN;
-			sort_cols[sort_key] = tmp->data;
-			break;
-		case MODEST_HEADER_VIEW_COLUMN_COMPACT_RECEIVED_DATE:
-			sort_key = hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_date"));
-			sort_ids[sort_key] = col_id;
-			sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN,
-			sort_cols[sort_key] = tmp->data;
-			default_key = sort_key;
-			break;
-		case MODEST_HEADER_VIEW_COLUMN_COMPACT_SENT_DATE:
-			sort_key = hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_date"));
-			sort_ids[sort_key] = col_id;
-			sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN,
-			sort_cols[sort_key] = tmp->data;
-			default_key = sort_key;
-			break;
-		default:
-			g_printerr ("modest: column (id: %i) not valid", col_id);
-			goto frees;
-		}
+	int sort_model_ids[6];
+	int sort_ids[6];
+
+
+	outgoing = (GPOINTER_TO_INT (g_object_get_data(G_OBJECT(cols->data), MODEST_HEADER_VIEW_COLUMN))==
+		    MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT);
+
+	sort_key = hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_sender_recipient"));
+	if (outgoing) {
+		sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_TO_COLUMN;
+		sort_ids[sort_key] = MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT;
+	} else {
+		sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN;
+		sort_ids[sort_key] = MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_IN;
 	}
-	
+
+	sort_key = hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_date"));
+	if (outgoing) {
+		sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN;
+		sort_ids[sort_key] = MODEST_HEADER_VIEW_COLUMN_COMPACT_SENT_DATE;
+	} else {
+		sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN;
+		sort_ids[sort_key] = MODEST_HEADER_VIEW_COLUMN_COMPACT_RECEIVED_DATE;
+	}
+	default_key = sort_key;
+
+	sort_key = hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_subject"));
+	sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_SUBJECT_COLUMN;
+	if (outgoing)
+		sort_ids[sort_key] = MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT;
+	else
+		sort_ids[sort_key] = MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_IN;
+
+	sort_key = hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_attachment"));
+	sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN;
+	sort_ids[sort_key] = TNY_HEADER_FLAG_ATTACHMENTS;
+	attachments_sort_id = sort_key;
+
+	sort_key = hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_size"));
+	sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_MESSAGE_SIZE_COLUMN;
+	sort_ids[sort_key] = 0;
+
+	sort_key = hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_priority"));
+	sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN;
+	sort_ids[sort_key] = TNY_HEADER_FLAG_PRIORITY;
+	priority_sort_id = sort_key;
+
+	sortable = GTK_TREE_SORTABLE (gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (gtk_tree_view_get_model (GTK_TREE_VIEW (header_view)))));
 	/* Launch dialogs */
-	hildon_sort_dialog_set_sort_key (dialog, default_key);
-	hildon_sort_dialog_set_sort_order (dialog, GTK_SORT_DESCENDING);
+	if (!gtk_tree_sortable_get_sort_column_id (sortable,
+						   &current_sort_colid, &current_sort_type)) {
+		hildon_sort_dialog_set_sort_key (dialog, default_key);
+		hildon_sort_dialog_set_sort_order (dialog, GTK_SORT_DESCENDING);
+	} else {
+		hildon_sort_dialog_set_sort_order (dialog, current_sort_type);
+		if (current_sort_colid == TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN) {
+			gpointer flags_sort_type_pointer;
+			flags_sort_type_pointer = g_object_get_data (G_OBJECT (cols->data), MODEST_HEADER_VIEW_FLAG_SORT);
+			if (GPOINTER_TO_INT (flags_sort_type_pointer) == TNY_HEADER_FLAG_PRIORITY)
+				hildon_sort_dialog_set_sort_key (dialog, priority_sort_id);
+			else
+				hildon_sort_dialog_set_sort_key (dialog, attachments_sort_id);
+		} else {
+			gint current_sort_keyid = 0;
+			while (current_sort_keyid < 6) {
+				if (sort_model_ids[current_sort_keyid] == current_sort_colid)
+					break;
+				else 
+					current_sort_keyid++;
+			}
+			hildon_sort_dialog_set_sort_key (dialog, current_sort_keyid);
+		}
+	}
+
 	result = gtk_dialog_run (GTK_DIALOG (dialog));
 	if (result == GTK_RESPONSE_OK) {
 		sort_key = hildon_sort_dialog_get_sort_key (dialog);
 		sort_type = hildon_sort_dialog_get_sort_order (dialog);
-		if (sort_ids[sort_key] == MODEST_HEADER_VIEW_COLUMN_COMPACT_FLAG)
-			g_object_set_data(G_OBJECT(sort_cols[sort_key]), 
-					  MODEST_HEADER_VIEW_FLAG_SORT, 
-					  GINT_TO_POINTER(sort_model_ids[sort_key]));
-		
-		else
-			gtk_tree_view_column_set_sort_column_id (sort_cols[sort_key], sort_model_ids[sort_key]);
-		
-		modest_header_view_sort_by_column_id (header_view, sort_ids[sort_key], sort_type);
+		if (sort_model_ids[sort_key] == TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN) {
+			g_object_set_data (G_OBJECT(cols->data), MODEST_HEADER_VIEW_FLAG_SORT,
+					   GINT_TO_POINTER (sort_ids[sort_key]));
+			/* This is a hack to make it resort rows always when flag fields are
+			 * selected. If we do not do this, changing sort field from priority to
+			 * attachments does not work */
+			modest_header_view_sort_by_column_id (header_view, 0, sort_type);
+		} else {
+			gtk_tree_view_column_set_sort_column_id (GTK_TREE_VIEW_COLUMN (cols->data), 
+								 sort_model_ids[sort_key]);
+		}
+
+		modest_header_view_sort_by_column_id (header_view, sort_model_ids[sort_key], sort_type);
+		gtk_tree_sortable_sort_column_changed (sortable);
 	}
+
+	modest_widget_memory_save (modest_runtime_get_conf (),
+				   G_OBJECT (header_view), MODEST_CONF_HEADER_VIEW_KEY);
 	
+/* 	while (gtk_events_pending ()) */
+/* 		gtk_main_iteration (); */
+
 	/* free */
- frees:
 	g_list_free(cols);	
 }
 
-
-
-gint
-modest_platform_run_new_folder_dialog (GtkWindow *parent_window,
-				       TnyFolderStore *parent_folder,
-				       gchar *suggested_name,
-				       gchar **folder_name)
+static gint
+modest_platform_run_folder_name_dialog (GtkWindow *parent_window,
+					const gchar *dialog_title,
+					const gchar *label_text,
+					const gchar *suggested_name,
+					gchar **folder_name)
 {
+	GtkWidget *accept_btn = NULL; 
 	GtkWidget *dialog, *entry, *label, *hbox;
+	GList *buttons = NULL;
 	gint result;
 
 	/* Ask the user for the folder name */
-	dialog = gtk_dialog_new_with_buttons (_("mcen_ti_new_folder"),
+	dialog = gtk_dialog_new_with_buttons (dialog_title,
 					      parent_window,
 					      GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR | GTK_DIALOG_DESTROY_WITH_PARENT,
 					      GTK_STOCK_OK,
@@ -567,8 +782,11 @@ modest_platform_run_new_folder_dialog (GtkWindow *parent_window,
 					      GTK_RESPONSE_REJECT,
 					      NULL);
 
+	/* Add accept button (with unsensitive handler) */
+	buttons = gtk_container_get_children (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area));
+	accept_btn = GTK_WIDGET (buttons->next->data);
 	/* Create label and entry */
-	label = gtk_label_new (_("mcen_fi_new_folder_name"));
+	label = gtk_label_new (label_text);
 	/* TODO: check that the suggested name does not exist */
 	/* We set 21 as maximum because we want to show WID-INF036
 	   when the user inputs more that 20 */
@@ -600,16 +818,97 @@ modest_platform_run_new_folder_dialog (GtkWindow *parent_window,
 	
 	gtk_widget_show_all (GTK_WIDGET(GTK_DIALOG(dialog)->vbox));
 	
+	gtk_window_set_transient_for (GTK_WINDOW (dialog), parent_window);
 	result = gtk_dialog_run (GTK_DIALOG(dialog));
 	if (result == GTK_RESPONSE_ACCEPT)
 		*folder_name = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)));
 
 	gtk_widget_destroy (dialog);
 
+	while (gtk_events_pending ())
+		gtk_main_iteration ();
+
+	return result;
+}
+
+gint
+modest_platform_run_new_folder_dialog (GtkWindow *parent_window,
+				       TnyFolderStore *parent_folder,
+				       gchar *suggested_name,
+				       gchar **folder_name)
+{
+	gchar *real_suggested_name = NULL;
+	gint result;
+
+	if(suggested_name == NULL)
+	{
+		const gchar *default_name = _("mcen_ia_default_folder_name");
+		unsigned int i;
+		gchar num_str[3];
+
+		for(i = 0; i < 100; ++ i)
+		{
+			TnyList *list = tny_simple_list_new ();
+			TnyFolderStoreQuery *query = tny_folder_store_query_new ();
+			guint length;
+
+			sprintf(num_str, "%.2u", i);
+
+			if (i == 0)
+				real_suggested_name = g_strdup (default_name);
+			else
+				real_suggested_name = g_strdup_printf (_("mcen_ia_default_folder_name_s"),
+				                                       num_str);
+
+			tny_folder_store_query_add_item (query, real_suggested_name,
+			                                 TNY_FOLDER_STORE_QUERY_OPTION_MATCH_ON_NAME);
+
+			tny_folder_store_get_folders (parent_folder, list, query, NULL);
+
+			length = tny_list_get_length (list);
+			g_object_unref (query);
+			g_object_unref (list);
+
+			if (length == 0)
+				break;
+
+			g_free (real_suggested_name);
+		}
+
+		/* Didn't find a free number */
+		if (i == 100)
+			real_suggested_name = g_strdup (default_name);
+	}
+	else
+	{
+		real_suggested_name = suggested_name;
+	}
+
+	result = modest_platform_run_folder_name_dialog (parent_window, 
+	                                                 _("mcen_ti_new_folder"),
+	                                                 _("mcen_fi_new_folder_name"),
+	                                                 real_suggested_name,
+	                                                 folder_name);
+	if (suggested_name == NULL)
+		g_free(real_suggested_name);
+
 	return result;
 }
 
 gint
+modest_platform_run_rename_folder_dialog (GtkWindow *parent_window,
+					  TnyFolderStore *parent_folder,
+					  const gchar *suggested_name,
+					  gchar **folder_name)
+{
+	return modest_platform_run_folder_name_dialog (parent_window, 
+						       _("New folder name"),
+						       _("Enter new folder name:"),
+						       suggested_name,
+						       folder_name);
+}
+
+gint
 modest_platform_run_confirmation_dialog (GtkWindow *parent_window,
 					 const gchar *message)
 {
@@ -617,11 +916,38 @@ modest_platform_run_confirmation_dialog (GtkWindow *parent_window,
 	gint response;
 
 	dialog = hildon_note_new_confirmation (parent_window, message);
+	gtk_window_set_modal (GTK_WINDOW(dialog), TRUE);
+
+	response = gtk_dialog_run (GTK_DIALOG (dialog));
+
+	gtk_widget_destroy (GTK_WIDGET (dialog));
+
+	while (gtk_events_pending ())
+		gtk_main_iteration ();
+
+	return response;
+}
+
+gint
+modest_platform_run_yes_no_dialog (GtkWindow *parent_window,
+				   const gchar *message)
+{
+	GtkWidget *dialog;
+	gint response;
+
+	dialog = hildon_note_new_confirmation_add_buttons (parent_window, message,
+							   _("mcen_bd_yes"), GTK_RESPONSE_YES,
+							   _("mcen_bd_no"), GTK_RESPONSE_NO,
+							   NULL);
+	gtk_window_set_modal (GTK_WINDOW(dialog), TRUE);
 
 	response = gtk_dialog_run (GTK_DIALOG (dialog));
 
 	gtk_widget_destroy (GTK_WIDGET (dialog));
 
+	while (gtk_events_pending ())
+		gtk_main_iteration ();
+
 	return response;
 }
 
@@ -633,24 +959,194 @@ modest_platform_run_information_dialog (GtkWindow *parent_window,
 
 	dialog = hildon_note_new_information (parent_window, message);
 
-	gtk_dialog_run (GTK_DIALOG (dialog));
+	g_signal_connect_swapped (dialog,
+				  "response", 
+				  G_CALLBACK (gtk_widget_destroy),
+				  dialog);
 
-	gtk_widget_destroy (GTK_WIDGET (dialog));
+	gtk_widget_show_all (dialog);
 }
 
-gboolean modest_platform_connect_and_wait (GtkWindow *parent_window)
+
+
+typedef struct
+{
+	GMainLoop* loop;
+} UtilIdleData;
+
+static gboolean 
+on_idle_connect_and_wait(gpointer user_data)
 {
+	printf ("DEBUG: %s:\n", __FUNCTION__);
 	TnyDevice *device = modest_runtime_get_device();
+	if (!tny_device_is_online (device)) {
+
+		/* This is a GDK lock because we are an idle callback and
+		 * tny_maemo_conic_device_connect can contain Gtk+ code */
+
+		gdk_threads_enter(); /* CHECKED */
+		tny_maemo_conic_device_connect (TNY_MAEMO_CONIC_DEVICE (device), NULL);
+		gdk_threads_leave(); /* CHECKED */
+	}
+	
+	/* Allow the function that requested this idle callback to continue: */
+	UtilIdleData *data = (UtilIdleData*)user_data;
+	if (data->loop)
+		g_main_loop_quit (data->loop);
 	
+	return FALSE; /* Don't call this again. */
+}
+
+static gboolean connect_request_in_progress = FALSE;
+
+/* This callback is used when connect_and_wait() is already queued as an idle callback.
+ * This can happen because the gtk_dialog_run() for the connection dialog 
+ * (at least in the fake scratchbox version) allows idle handlers to keep running.
+ */
+static gboolean 
+on_idle_wait_for_previous_connect_to_finish(gpointer user_data)
+{
+	gboolean result = FALSE;
+	TnyDevice *device = modest_runtime_get_device();
 	if (tny_device_is_online (device))
-		return TRUE;
+		result = FALSE; /* Stop trying. */
+	else {
+		/* Keep trying until connect_request_in_progress is FALSE. */
+		if (connect_request_in_progress)
+			result = TRUE; /* Keep trying */
+		else {
+			printf ("DEBUG: %s: other idle has finished.\n", __FUNCTION__);
+						
+			result = FALSE; /* Stop trying, now that a result should be available. */
+		}
+	}
+	
+	if (result == FALSE) {
+		/* Allow the function that requested this idle callback to continue: */
+		UtilIdleData *data = (UtilIdleData*)user_data;
+		if (data->loop)
+			g_main_loop_quit (data->loop);	
+	}
 		
-	/* TODO: Block on the result: */
-	gboolean request_sent = tny_maemo_conic_device_connect (TNY_MAEMO_CONIC_DEVICE (device), NULL);
-	if (!request_sent)
+	return result;
+}
+
+static void 
+set_account_to_online (TnyAccount *account)
+{
+	/* TODO: This is necessary to prevent a cancel of the password dialog 
+	 * from making a restart necessary to be asked the password again,
+	 * but it causes a hang:
+	 */
+	#if 0
+	if (account && TNY_IS_CAMEL_STORE_ACCOUNT (account)) {
+		/* Make sure that store accounts are online too, 
+		 * because tinymail sets accounts to offline if 
+		 * a password dialog is ever cancelled.
+		 * We don't do this for transport accounts because 
+		 * a) They fundamentally need network access, so they can't really be offline.
+		 * b) That might cause a transport connection to happen too early.
+		 */
+		GError *error = NULL;
+		tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (account), TRUE, &error);
+		if (error) {
+			g_warning ("%s: tny_camel_account_set_online() returned a GError:\n  %s\n", 
+				__FUNCTION__, error->message);
+			g_error_free (error);	
+		}
+	}
+	#endif
+}
+
+gboolean modest_platform_connect_and_wait (GtkWindow *parent_window, TnyAccount *account)
+{
+	if (connect_request_in_progress)
 		return FALSE;
+		
+	printf ("DEBUG: %s:\n", __FUNCTION__);
+	TnyDevice *device = modest_runtime_get_device();
+	
+	if (tny_device_is_online (device)) {
+		printf ("DEBUG: %s: Already online.\n", __FUNCTION__);
+		set_account_to_online (account);
+		return TRUE;
+	} else
+	{
+		printf ("DEBUG: %s: tny_device_is_online() returned FALSE\n", __FUNCTION__);
+	}
+		
+	/* This blocks on the result: */
+	UtilIdleData *data = g_slice_new0 (UtilIdleData);
+	
+	GMainContext *context = NULL; /* g_main_context_new (); */
+	data->loop = g_main_loop_new (context, FALSE /* not running */);
+	
+	/* Cause the function to be run in an idle-handler, which is always 
+	 * in the main thread:
+	 */
+	if (!connect_request_in_progress) {
+		printf ("DEBUG: %s: First request\n", __FUNCTION__);
+		connect_request_in_progress = TRUE;
+		g_idle_add (&on_idle_connect_and_wait, data);
+	}
+	else {
+		printf ("DEBUG: %s: nth request\n", __FUNCTION__);
+		g_idle_add_full (G_PRIORITY_LOW, &on_idle_wait_for_previous_connect_to_finish, data, NULL);
+	}
 
-	return TRUE;
+	/* This main loop will run until the idle handler has stopped it: */
+	printf ("DEBUG: %s: before g_main_loop_run()\n", __FUNCTION__);
+	GDK_THREADS_LEAVE();
+	g_main_loop_run (data->loop);
+	GDK_THREADS_ENTER();
+	printf ("DEBUG: %s: after g_main_loop_run()\n", __FUNCTION__);
+	connect_request_in_progress = FALSE;
+	printf ("DEBUG: %s: Finished\n", __FUNCTION__);
+	g_main_loop_unref (data->loop);
+	/* g_main_context_unref (context); */
+
+	g_slice_free (UtilIdleData, data);
+
+	gboolean result = tny_device_is_online (device);
+
+	if (result)
+		set_account_to_online (account);
+
+	return result;
+}
+
+gboolean modest_platform_connect_and_wait_if_network_account (GtkWindow *parent_window, TnyAccount *account)
+{
+	if (tny_account_get_account_type (account) == TNY_ACCOUNT_TYPE_STORE) {
+		if (!TNY_IS_CAMEL_POP_STORE_ACCOUNT (account) &&
+		    !TNY_IS_CAMEL_IMAP_STORE_ACCOUNT (account)) {
+			/* This must be a maildir account, which does not require a connection: */
+			return TRUE;
+		}
+	}
+
+	return modest_platform_connect_and_wait (parent_window, account);
+}
+
+gboolean modest_platform_connect_and_wait_if_network_folderstore (GtkWindow *parent_window, TnyFolderStore *folder_store)
+{
+	if (!folder_store)
+		return TRUE; /* Maybe it is something local. */
+		
+	gboolean result = TRUE;
+	if (TNY_IS_FOLDER (folder_store)) {
+		/* Get the folder's parent account: */
+		TnyAccount *account = tny_folder_get_account(TNY_FOLDER (folder_store));
+		if (account != NULL) {
+			result = modest_platform_connect_and_wait_if_network_account (NULL, account);
+			g_object_unref (account);
+		}
+	} else if (TNY_IS_ACCOUNT (folder_store)) {
+		/* Use the folder store as an account: */
+		result = modest_platform_connect_and_wait_if_network_account (NULL, TNY_ACCOUNT (folder_store));
+	}
+
+	return result;
 }
 
 void
@@ -700,35 +1196,34 @@ gboolean modest_platform_set_update_interval (guint minutes)
      
 	/* Register alarm: */
 	
-	/* Get current time: */
-	time_t time_now;
-	time (&time_now);
-	struct tm *st_time = localtime (&time_now);
-	
-	/* Add minutes to tm_min field: */
-	st_time->tm_min += minutes;
+	/* Set the interval in alarm_event_t structure: */
+	alarm_event_t *event = g_new0(alarm_event_t, 1);
+	event->alarm_time = minutes * 60; /* seconds */
 	
-	/* Set the time in alarm_event_t structure: */
-	alarm_event_t event;
-	memset (&event, 0, sizeof (alarm_event_t));
-	event.alarm_time = mktime (st_time);
+	/* Set recurrence every few minutes: */
+	event->recurrence = minutes;
+	event->recurrence_count = -1; /* Means infinite */
 
 	/* Specify what should happen when the alarm happens:
 	 * It should call this D-Bus method: */
 	 
-	/* Note: I am surpised that alarmd can't just use the modest.service file
-	 * for this. murrayc. */
-	event.dbus_path = g_strdup(PREFIX "/bin/modest");
+	event->dbus_path = g_strdup(MODEST_DBUS_OBJECT);
+	event->dbus_interface = g_strdup (MODEST_DBUS_IFACE);
+	event->dbus_service = g_strdup (MODEST_DBUS_SERVICE);
+	event->dbus_name = g_strdup (MODEST_DBUS_METHOD_SEND_RECEIVE);
+
+	/* Use ALARM_EVENT_NO_DIALOG: Otherwise, a dialog will be shown if 
+	 * exec_name or dbus_path is NULL, even though we have specified no dialog text.
+	 * Also use ALARM_EVENT_ACTIVATION so that modest is started (without UI) to get emails 
+	 * This is why we want to use the Alarm API instead of just g_timeout_add().
+	 * (The old maemo email-client did this, though it isn't specified in the UI spec.)
+         */
+	event->flags = ALARM_EVENT_NO_DIALOG | ALARM_EVENT_ACTIVATION;
 	
-	event.dbus_interface = g_strdup (MODEST_DBUS_IFACE);
-	event.dbus_service = g_strdup (MODEST_DBUS_SERVICE);
-	event.dbus_name = g_strdup (MODEST_DBUS_METHOD_SEND_RECEIVE);
+	alarm_cookie = alarm_event_add (event);
 
-	/* Otherwise, a dialog will be shown if exect_name or dbus_path is NULL,
-	even though we have specified no dialog text: */
-	event.flags = ALARM_EVENT_NO_DIALOG;
-	
-	alarm_cookie = alarm_event_add (&event);
+	/* now, free it */
+	alarm_event_free (event);
 	
 	/* Store the alarm ID in GConf, so we can remove it later:
 	 * This is apparently valid between application instances. */
@@ -737,20 +1232,22 @@ gboolean modest_platform_set_update_interval (guint minutes)
 	if (!alarm_cookie) {
 	    /* Error */
 	    const alarm_error_t alarm_error = alarmd_get_error ();
-	    printf ("Error setting alarm event. Error code: '%d'\n", alarm_error);
+	    g_debug ("Error setting alarm event. Error code: '%d'\n", alarm_error);
 	    
 	    /* Give people some clue: */
 	    /* The alarm API should have a function for this: */
 	    if (alarm_error == ALARMD_ERROR_DBUS) {
-	    	printf ("  ALARMD_ERROR_DBUS: An error with D-Bus occurred, probably coudn't get a D-Bus connection.\n");
+	    	g_debug ("  ALARMD_ERROR_DBUS: An error with D-Bus occurred, probably coudn't get a D-Bus connection.\n");
 	    } else if (alarm_error == ALARMD_ERROR_CONNECTION) {
-	    	printf ("  ALARMD_ERROR_CONNECTION: Could not contact alarmd via D-Bus.\n");
+	    	g_debug ("  ALARMD_ERROR_CONNECTION: Could not contact alarmd via D-Bus.\n");
 	    } else if (alarm_error == ALARMD_ERROR_INTERNAL) {
-	    	printf ("  ALARMD_ERROR_INTERNAL: Some alarmd or libalarm internal error, possibly a version mismatch.\n");
+	    	g_debug ("  ALARMD_ERROR_INTERNAL: Some alarmd or libalarm internal error, possibly a version mismatch.\n");
 	    } else if (alarm_error == ALARMD_ERROR_MEMORY) {
-	    	printf ("  ALARMD_ERROR_MEMORY: A memory allocation failed.\n");
+	    	g_debug ("  ALARMD_ERROR_MEMORY: A memory allocation failed.\n");
 	    } else if (alarm_error == ALARMD_ERROR_ARGUMENT) {
-	    	printf ("  ALARMD_ERROR_ARGUMENT: An argument given by caller was invalid.\n");
+	    	g_debug ("  ALARMD_ERROR_ARGUMENT: An argument given by caller was invalid.\n");
+	    } else if (alarm_error == ALARMD_ERROR_NOT_RUNNING) {
+	    	g_debug ("  ALARMD_ERROR_NOT_RUNNING: alarmd is not running.\n");
 	    }
 	    
 	    return FALSE;
@@ -768,8 +1265,118 @@ modest_platform_get_global_settings_dialog ()
 void 
 modest_platform_on_new_msg (void)
 {
-	/* TODO: play sound SR-SND-18 */
-	/* TODO: LED lightning pattern */
-	/* TODO: update the application icon in the task navigator */ 
-	g_print ("--------------- NEW MESSAGE ARRIVED ---------------\n");
+#ifdef MODEST_HAVE_HILDON_NOTIFY
+	HildonNotification *not;
+
+	/* Create a new notification. FIXME put the right values, need
+	   some more specs */
+	not = hildon_notification_new ("TODO: (new email) Summary",
+				       "TODO: (new email) Description",
+				       "qgn_contact_group_chat_invitation",
+				       "system.note.dialog");
+
+	/* Play sound SR-SND-18. TODO: play the right file */
+	/* TODO: Where is this declared? hildon_notification_set_sound (not, "/usr/share/sounds/ui-new_email.wav"); */
+
+	/* Set the led pattern */
+	notify_notification_set_hint_int32 (NOTIFY_NOTIFICATION (not), "led-pattern", 3);
+
+	/* Notify. We need to do this in an idle because this function
+	   could be called from a thread */
+	if (!notify_notification_show (NOTIFY_NOTIFICATION (not), NULL))
+		g_error ("Failed to send notification");
+		
+	g_object_unref (not);
+#endif /*MODEST_HAVE_HILDON_NOTIFY*/
+}
+
+
+void
+modest_platform_show_help (GtkWindow *parent_window, 
+			   const gchar *help_id)
+{
+	osso_return_t result;
+
+	g_return_if_fail (help_id);
+	g_return_if_fail (osso_context);
+
+	/* Show help */
+#ifdef MODEST_HAVE_OSSO_HELP
+	result = ossohelp_show (osso_context, help_id, OSSO_HELP_SHOW_DIALOG);
+#else
+	result = hildon_help_show (osso_context, help_id, OSSO_HELP_SHOW_DIALOG);
+#endif
+
+	if (result != OSSO_OK) {
+		gchar *error_msg;
+		error_msg = g_strdup_printf ("FIXME The help topic %s could not be found", help_id); 
+		hildon_banner_show_information (GTK_WIDGET (parent_window),
+						NULL,
+						error_msg);
+		g_free (error_msg);
+	}
+}
+
+void 
+modest_platform_show_search_messages (GtkWindow *parent_window)
+{
+	osso_return_t result = OSSO_ERROR;
+	
+	result = osso_rpc_run_with_defaults (osso_context, "osso_global_search", "search_email", NULL, DBUS_TYPE_INVALID);
+
+	if (result != OSSO_OK) {
+		g_warning ("%s: osso_rpc_run_with_defaults() failed.\n", __FUNCTION__);
+	}
+}
+
+void 
+modest_platform_show_addressbook (GtkWindow *parent_window)
+{
+	osso_return_t result = OSSO_ERROR;
+	
+	result = osso_rpc_run_with_defaults (osso_context, "osso_addressbook", "top_application", NULL, DBUS_TYPE_INVALID);
+
+	if (result != OSSO_OK) {
+		g_warning ("%s: osso_rpc_run_with_defaults() failed.\n", __FUNCTION__);
+	}
+}
+
+GtkWidget *
+modest_platform_create_folder_view (TnyFolderStoreQuery *query)
+{
+	GtkWidget *widget = modest_folder_view_new (query);
+
+	/* Show one account by default */
+	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;
+}
+
+void 
+modest_platform_information_banner (GtkWidget *parent,
+				    const gchar *icon_name,
+				    const gchar *text)
+{
+	hildon_banner_show_information (parent, icon_name, text);
+}
+
+GtkWidget *
+modest_platform_animation_banner (GtkWidget *parent,
+				  const gchar *animation_name,
+				  const gchar *text)
+{
+	GtkWidget *inf_note = NULL;
+
+	g_return_val_if_fail (text != NULL, NULL);
+
+	inf_note = hildon_banner_show_animation (parent, animation_name, text);
+
+	return inf_note;
 }