* don't try to open file:-uri's, and don't add them to CSMs
[modest] / src / maemo / modest-platform.c
index c781dba..e16317a 100644 (file)
 #include "maemo/modest-maemo-global-settings-dialog.h"
 #include "modest-widget-memory.h"
 #include <modest-hildon-includes.h>
-#include <osso-helplib.h>
 #include <modest-maemo-utils.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 <gtk/gtkmain.h>
 #include <modest-text-utils.h>
 #include "modest-tny-folder.h"
+#include "modest-tny-account.h"
 #include <string.h>
+#include <libgnomevfs/gnome-vfs-mime-utils.h>
+
+#ifdef MODEST_HAVE_ABOOK
+#include <libosso-abook/osso-abook.h>
+#endif /*MODEST_HAVE_ABOOK*/
+
+#ifdef MODEST_HAVE_LIBALARM
+#include <alarmd/alarm_event.h> /* For alarm_event_add(), etc. */
+#endif /*MODEST_HAVE_LIBALARM*/
 
 
 #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, 
@@ -68,6 +73,8 @@ on_modest_conf_update_interval_changed (ModestConf* self,
                                        ModestConfNotificationId id, 
                                        gpointer user_data)
 {
+       g_return_if_fail (key);
+       
        if (strcmp (key, MODEST_CONF_UPDATE_INTERVAL) == 0) {
                const guint update_interval_minutes = 
                        modest_conf_get_int (self, MODEST_CONF_UPDATE_INTERVAL, NULL);
@@ -75,26 +82,56 @@ on_modest_conf_update_interval_changed (ModestConf* self,
        }
 }
 
+
+
+static gboolean
+check_required_files (void)
+{
+       FILE *mcc_file = modest_maemo_open_mcc_mapping_file ();
+       if (!mcc_file) {
+               g_printerr ("modest: check for mcc file failed\n");
+               return FALSE;
+       } else 
+               fclose (mcc_file);
+       
+       if (access(MODEST_PROVIDER_DATA_FILE, R_OK) != 0 &&
+           access(MODEST_MAEMO_PROVIDER_DATA_FILE, R_OK) != 0) {
+               g_printerr ("modest: cannot find providers data\n");
+               return FALSE;
+       }
+       
+       return TRUE;
+}
+
+
+/* the gpointer here is the osso_context. */
 gboolean
 modest_platform_init (int argc, char *argv[])
 {
+       osso_context_t *osso_context;
+       
        osso_hw_state_t hw_state = { 0 };
        DBusConnection *con;    
-
-       osso_context =
-               osso_initialize(PACKAGE,PACKAGE_VERSION,
-                               FALSE, NULL);   
+       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);
 
        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 
@@ -117,23 +154,12 @@ modest_platform_init (int argc, char *argv[])
                                modest_dbus_req_handler, NULL /* user_data */);
        if (result != OSSO_OK) {
                        g_printerr ("modest: Error setting D-BUS callback (%d)\n", result);
-                       return FALSE;
+               return FALSE;
        }
 
-       /* Add handler for Exit D-BUS messages.
-        * Not used because osso_application_set_exit_cb() is deprecated and obsolete:
-       result = osso_application_set_exit_cb(osso_context,
-                                          modest_dbus_exit_event_handler,
-                                          (gpointer) NULL);
-       if (result != OSSO_OK) {
-               g_print("Error setting exit callback (%d)\n", result);
-               return OSSO_ERROR;
-       }
-       */
-
        /* Register hardware event dbus callback: */
        hw_state.shutdown_ind = TRUE;
-       osso_hw_set_event_cb(osso_context, NULL,/*&hw_state*/ modest_osso_cb_hw_state_handler, NULL);
+       osso_hw_set_event_cb(osso_context, NULL, NULL, NULL);
 
        /* Register osso auto-save callbacks: */
        result = osso_application_set_autosave_cb (osso_context, 
@@ -157,65 +183,49 @@ modest_platform_init (int argc, char *argv[])
                          "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);
 
+       /* only force the setting of the default interval, if there are actually
+        * any accounts */
+       acc_names = modest_account_mgr_account_names (modest_runtime_get_account_mgr(), TRUE);
+       if (acc_names) {
+               /* 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);
+               modest_account_mgr_free_account_names (acc_names);
+       }
+
+       
+#ifdef MODEST_HAVE_ABOOK
        /* initialize the addressbook */
        if (!osso_abook_init (&argc, &argv, osso_context)) {
                g_printerr ("modest: failed to initialized addressbook\n");
                return FALSE;
        }
-               
+#endif /*MODEST_HAVE_ABOOK*/
+
        return TRUE;
 }
 
-TnyDevice*
-modest_platform_get_new_device (void)
+gboolean
+modest_platform_uninit (void)
 {
-       return TNY_DEVICE (tny_maemo_conic_device_new ());
+       osso_context_t *osso_context =
+               modest_maemo_utils_get_osso_context ();
+       if (osso_context)
+               osso_deinitialize (osso_context);
+
+       return TRUE;
 }
 
 
-const gchar*
-guess_mime_type_from_name (const gchar* name)
+
+
+TnyDevice*
+modest_platform_get_new_device (void)
 {
-       int i;
-       const static gchar* mime_type;
-       const static gchar* mime_map[][2] = {
-               { ".note.html", "text/note"}, /* for the osso_notes program */
-               { ".deb",       "application/x-deb"},
-               { ".install",   "application/x-install-instructions"},
-               { ".html",      "text/html"}, 
-               { ".htm",       "text/html"}, 
-               { ".pdf",       "application/pdf"},
-               { ".doc",       "application/msword"},
-               { ".xls",       "application/excel"},
-               { ".png",       "image/png" },
-               { ".gif",       "image/gif" },
-               { ".jpg",       "image/jpeg"},
-               { ".jpeg",      "image/jpeg"},
-               { ".mp3",       "audio/mp3" }
-       };
-
-       mime_type = "application/octet-stream";
-
-       if (name) {
-               gchar* lc_name = g_utf8_strdown (name, -1);
-               for (i = 0; i != G_N_ELEMENTS(mime_map); ++i) {
-                       if (g_str_has_suffix (lc_name, mime_map[i][0])) {
-                               mime_type = mime_map[i][1];
-                               break;
-                       }
-               }
-               g_free (lc_name);
-       }
-       
-       return mime_type;
+       return TNY_DEVICE (tny_maemo_conic_device_new ());
 }
 
-
 gchar*
 modest_platform_get_file_icon_name (const gchar* name, const gchar* mime_type,
                                    gchar **effective_mime_type)
@@ -223,15 +233,16 @@ modest_platform_get_file_icon_name (const gchar* name, const gchar* mime_type,
        GString *mime_str = NULL;
        gchar *icon_name  = NULL;
        gchar **icons, **cursor;
-
-       if (!mime_type || !g_ascii_strcasecmp (mime_type, "application/octet-stream")) 
-               mime_str = g_string_new (guess_mime_type_from_name(name));
+       
+       if (!mime_type || g_ascii_strcasecmp (mime_type, "application/octet-stream") == 0) 
+               mime_str = g_string_new (gnome_vfs_get_mime_type_for_name (name));
        else {
                mime_str = g_string_new (mime_type);
                g_string_ascii_down (mime_str);
        }
-
+       
        icons = hildon_mime_get_icon_names (mime_str->str, NULL);
+       
        for (cursor = icons; cursor; ++cursor) {
                if (!g_ascii_strcasecmp (*cursor, "gnome-mime-message") ||
                    !g_ascii_strcasecmp (*cursor, "gnome-mime-message-rfc822")) {
@@ -248,47 +259,69 @@ modest_platform_get_file_icon_name (const gchar* name, const gchar* mime_type,
                *effective_mime_type = g_string_free (mime_str, FALSE);
        else
                g_string_free (mime_str, TRUE);
-
+       
        return icon_name;
 }
 
 
+static gboolean
+checked_hildon_uri_open (const gchar *uri, HildonURIAction *action)
+{
+       GError *err = NULL;
+       gboolean result;
+
+       g_return_val_if_fail (uri, FALSE);
+       
+       result = hildon_uri_open (uri, action, &err);
+       if (!result) {
+               g_printerr ("modest: hildon_uri_open ('%s', %p) failed: %s",
+                           uri, action,  err && err->message ? err->message : "unknown error");
+               if (err)
+                       g_error_free (err);
+       }
+       return result;
+}
+
+
+
 gboolean 
 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);
+       /* don't try to activate file: uri's -- they might confuse the user,
+        * and/or might have security implications */
+       if (!g_str_has_prefix (uri, "file:")) {
+               
+               actions = hildon_uri_get_actions_by_uri (uri, -1, 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) {
+                               result = checked_hildon_uri_open (uri, action);
+                               break;
                        }
-                       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"));
+               /* if we could not open it with email, try something else */
+               if (!result)
+                       result = checked_hildon_uri_open (uri, NULL);   
+       } 
+       
+       if (!result) {
+               ModestWindow *parent =
+                       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);
+       } 
        
        return result;
 }
@@ -299,9 +332,9 @@ modest_platform_activate_file (const gchar *path, const gchar *mime_type)
        gint result = 0;
        DBusConnection *con;
        gchar *uri_path = NULL;
-
+       
        uri_path = g_strconcat ("file://", path, NULL); 
-       con = osso_get_dbus_connection (osso_context);
+       con = osso_get_dbus_connection (modest_maemo_utils_get_osso_context());
        
        if (mime_type)
                result = hildon_mime_open_file_with_mime_type (con, uri_path, mime_type);
@@ -362,7 +395,12 @@ activate_uri_popup_item (GtkMenuItem *menu_item,
        for (node = popup_info->actions; node != NULL; node = g_slist_next (node)) {
                HildonURIAction *action = (HildonURIAction *) node->data;
                if (strcmp (action_name, hildon_uri_action_get_name (action))==0) {
-                       hildon_uri_open (popup_info->uri, action, NULL);
+                       if (!checked_hildon_uri_open (popup_info->uri, action)) {
+                               ModestWindow *parent =
+                                       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"));
+                       }
                        break;
                }
        }
@@ -371,44 +409,51 @@ activate_uri_popup_item (GtkMenuItem *menu_item,
 gboolean 
 modest_platform_show_uri_popup (const gchar *uri)
 {
-       gchar *scheme;
        GSList *actions_list;
 
        if (uri == NULL)
                return FALSE;
        
-       scheme = hildon_uri_get_scheme_from_uri (uri, NULL);
-       actions_list = hildon_uri_get_actions (scheme, NULL);
-       if (actions_list != NULL) {
-               GSList *node;
+       actions_list = hildon_uri_get_actions_by_uri (uri, -1, NULL);
+       if (actions_list) {
+
                GtkWidget *menu = gtk_menu_new ();
                ModestPlatformPopupInfo *popup_info = g_new0 (ModestPlatformPopupInfo, 1);
 
-               popup_info->actions = actions_list;
-               popup_info->uri = g_strdup (uri);
-             
-               for (node = actions_list; node != NULL; node = g_slist_next (node)) {
-                       GtkWidget *menu_item;
-                       const gchar *action_name;
-                       const gchar *translation_domain;
-                       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);
+               /* don't add actions for file: uri's -- they might confuse the user,
+                * and/or might have security implications
+                * we still allow to copy the url though
+                */
+               if (!g_str_has_prefix (uri, "file:")) {                 
+               
+                       GSList *node;                   
+                       popup_info->actions = actions_list;
+                       popup_info->uri = g_strdup (uri);
+                       
+                       for (node = actions_list; node != NULL; node = g_slist_next (node)) {
+                               GtkWidget *menu_item;
+                               const gchar *action_name;
+                               const gchar *translation_domain;
+                               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);
+                               }
+                               gtk_widget_show (menu_item);
                        }
-                       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"));
+               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);
@@ -425,7 +470,6 @@ modest_platform_show_uri_popup (const gchar *uri)
                hildon_banner_show_information (NULL, NULL, _("mcen_ib_unsupported_link"));
        }
        
-       g_free (scheme);
        return TRUE;
 }
 
@@ -543,6 +587,23 @@ entry_changed (GtkEditable *editable,
        g_free (chars);
 }
 
+static guint
+checked_hildon_sort_dialog_add_sort_key (HildonSortDialog *dialog, const gchar* key, guint max)
+{
+       gint sort_key;
+       
+       g_return_val_if_fail (dialog && HILDON_IS_SORT_DIALOG(dialog), 0);
+       g_return_val_if_fail (key, 0);
+       
+       sort_key = hildon_sort_dialog_add_sort_key (dialog, key);
+       if (sort_key < 0 || sort_key >= max) {
+               g_warning ("%s: out of range (%d) for %s", __FUNCTION__, sort_key, key);
+               return 0;
+       } else
+               return (guint)sort_key; 
+}
+
+
 static void
 launch_sort_headers_dialog (GtkWindow *parent_window,
                            HildonSortDialog *dialog)
@@ -565,19 +626,22 @@ launch_sort_headers_dialog (GtkWindow *parent_window,
                header_view = MODEST_HEADER_VIEW(modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(parent_window),
                                                                                      MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW));
        }
-       if (!header_view) return;
-
+       if (!header_view)
+               return;
+       
        /* Add sorting keys */
        cols = modest_header_view_get_columns (header_view);
-       if (cols == NULL) return;
-       int sort_model_ids[6];
-       int sort_ids[6];
-
+       if (cols == NULL) 
+               return;
+#define SORT_ID_NUM 6
+       int sort_model_ids[SORT_ID_NUM];
+       int sort_ids[SORT_ID_NUM];
 
        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"));
+       sort_key = checked_hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_sender_recipient"),
+                                                           SORT_ID_NUM - 1);
        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;
@@ -586,7 +650,8 @@ launch_sort_headers_dialog (GtkWindow *parent_window,
                sort_ids[sort_key] = MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_IN;
        }
 
-       sort_key = hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_date"));
+       sort_key = checked_hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_date"),
+                                                           SORT_ID_NUM - 1);
        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;
@@ -596,28 +661,33 @@ launch_sort_headers_dialog (GtkWindow *parent_window,
        }
        default_key = sort_key;
 
-       sort_key = hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_subject"));
+       sort_key = checked_hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_subject"),
+                                                           SORT_ID_NUM -1);
        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_key = checked_hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_attachment"),
+                                                           SORT_ID_NUM - 1);
        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_key = checked_hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_size"),
+                                                           SORT_ID_NUM - 1);
        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_key = checked_hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_priority"),
+                                                           SORT_ID_NUM - 1);
        sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN;
-       sort_ids[sort_key] = TNY_HEADER_FLAG_PRIORITY;
+       sort_ids[sort_key] = TNY_HEADER_FLAG_PRIORITY_MASK;
        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)))));
+       
+       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 */
        if (!gtk_tree_sortable_get_sort_column_id (sortable,
                                                   &current_sort_colid, &current_sort_type)) {
@@ -628,7 +698,7 @@ launch_sort_headers_dialog (GtkWindow *parent_window,
                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)
+                       if (GPOINTER_TO_INT (flags_sort_type_pointer) == TNY_HEADER_FLAG_PRIORITY_MASK)
                                hildon_sort_dialog_set_sort_key (dialog, priority_sort_id);
                        else
                                hildon_sort_dialog_set_sort_key (dialog, attachments_sort_id);
@@ -647,6 +717,11 @@ launch_sort_headers_dialog (GtkWindow *parent_window,
        result = gtk_dialog_run (GTK_DIALOG (dialog));
        if (result == GTK_RESPONSE_OK) {
                sort_key = hildon_sort_dialog_get_sort_key (dialog);
+               if (sort_key < 0 || sort_key > SORT_ID_NUM -1) {
+                       g_warning ("%s: out of range (%d)", __FUNCTION__, sort_key);
+                       sort_key = 0;
+               }
+
                sort_type = hildon_sort_dialog_get_sort_order (dialog);
                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,
@@ -667,9 +742,6 @@ launch_sort_headers_dialog (GtkWindow *parent_window,
        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 */
        g_list_free(cols);      
 }
@@ -684,21 +756,40 @@ on_response (GtkDialog *dialog,
        GList *child_vbox, *child_hbox;
        GtkWidget *hbox, *entry;
        TnyFolderStore *parent;
+       const gchar *new_name;
+       gboolean exists;
 
        if (response != GTK_RESPONSE_ACCEPT)
                return;
-
+       
        /* Get entry */
        child_vbox = gtk_container_get_children (GTK_CONTAINER (dialog->vbox));
        hbox = child_vbox->data;
        child_hbox = gtk_container_get_children (GTK_CONTAINER (hbox));
        entry = child_hbox->next->data;
-
+       
        parent = TNY_FOLDER_STORE (user_data);
-
+       new_name = gtk_entry_get_text (GTK_ENTRY (entry));
+       exists = FALSE;
+       
        /* Look for another folder with the same name */
        if (modest_tny_folder_has_subfolder_with_name (parent, 
-                                                      gtk_entry_get_text (GTK_ENTRY (entry)))) {
+                                                      new_name,
+                                                      TRUE)) {
+               exists = TRUE;
+       }
+       
+       if (!exists) {
+               if (TNY_IS_ACCOUNT (parent) &&
+                   modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (parent)) &&
+                   modest_tny_local_folders_account_folder_name_in_use (MODEST_TNY_LOCAL_FOLDERS_ACCOUNT (parent),
+                                                                        new_name)) {
+                       exists = TRUE;
+               }
+       }
+       
+       if (exists) {
+               
                /* Show an error */
                hildon_banner_show_information (gtk_widget_get_parent (GTK_WIDGET (dialog)), 
                                                NULL, _CS("ckdg_ib_folder_already_exists"));
@@ -711,6 +802,7 @@ on_response (GtkDialog *dialog,
 }
 
 
+
 static gint
 modest_platform_run_folder_name_dialog (GtkWindow *parent_window,
                                        TnyFolderStore *parent,
@@ -776,11 +868,8 @@ modest_platform_run_folder_name_dialog (GtkWindow *parent_window,
                            hbox, FALSE, FALSE, 0);
        
        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)));
@@ -818,9 +907,9 @@ modest_platform_run_new_folder_dialog (GtkWindow *parent_window,
                        else
                                real_suggested_name = g_strdup_printf (_("mcen_ia_default_folder_name_s"),
                                                                       num_str);
-
                        exists = modest_tny_folder_has_subfolder_with_name (parent_folder,
-                                                                           real_suggested_name);
+                                                                           real_suggested_name,
+                                                                           TRUE);
 
                        if (!exists)
                                break;
@@ -863,42 +952,52 @@ modest_platform_run_rename_folder_dialog (GtkWindow *parent_window,
                                                       folder_name);
 }
 
+
+
+static void
+on_destroy_dialog (GtkDialog *dialog)
+{
+       gtk_widget_destroy (GTK_WIDGET(dialog));
+       if (gtk_events_pending ())
+               gtk_main_iteration ();
+}
+
 gint
 modest_platform_run_confirmation_dialog (GtkWindow *parent_window,
                                         const gchar *message)
 {
        GtkWidget *dialog;
        gint response;
-
+       
        dialog = hildon_note_new_confirmation (parent_window, message);
-       gtk_window_set_modal (GTK_WINDOW(dialog), TRUE);
+       modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), 
+                                    GTK_WINDOW (dialog));
 
        response = gtk_dialog_run (GTK_DIALOG (dialog));
 
-       gtk_widget_destroy (GTK_WIDGET (dialog));
-
+       on_destroy_dialog (GTK_DIALOG(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);
-
+       modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (dialog));
        response = gtk_dialog_run (GTK_DIALOG (dialog));
-
-       gtk_widget_destroy (GTK_WIDGET (dialog));
+       
+       on_destroy_dialog (GTK_DIALOG(dialog));
 
        while (gtk_events_pending ())
                gtk_main_iteration ();
@@ -906,170 +1005,160 @@ modest_platform_run_yes_no_dialog (GtkWindow *parent_window,
        return response;
 }
 
+
+
 void
 modest_platform_run_information_dialog (GtkWindow *parent_window,
                                        const gchar *message)
 {
-       GtkWidget *dialog;
-
-       dialog = hildon_note_new_information (parent_window, message);
-
-       g_signal_connect_swapped (dialog,
+       GtkWidget *note;
+       
+       note = hildon_note_new_information (parent_window, message);
+       modest_window_mgr_set_modal (modest_runtime_get_window_mgr (),
+                                    GTK_WINDOW (note));
+       
+       g_signal_connect_swapped (note,
                                  "response", 
-                                 G_CALLBACK (gtk_widget_destroy),
-                                 dialog);
+                                 G_CALLBACK (on_destroy_dialog),
+                                 note);
 
-       gtk_widget_show_all (dialog);
+       gtk_widget_show_all (note);
 }
 
 
 
-typedef struct
-{
-       GMainLoop* loop;
-} UtilIdleData;
+typedef struct _ConnectAndWaitData {
+       GMutex *mutex;
+       GMainLoop *wait_loop;
+       gboolean has_callback;
+       gulong handler;
+} ConnectAndWaitData;
 
-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 void
+quit_wait_loop (TnyAccount *account,
+               ConnectAndWaitData *data) 
+{
+       /* Set the has_callback to TRUE (means that the callback was
+          executed and wake up every code waiting for cond to be
+          TRUE */
+       g_mutex_lock (data->mutex);
+       data->has_callback = TRUE;
+       if (data->wait_loop)
+               g_main_loop_quit (data->wait_loop);
+       g_mutex_unlock (data->mutex);
 }
 
-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)
+static void
+on_connection_status_changed (TnyAccount *account, 
+                             TnyConnectionStatus status,
+                             gpointer user_data)
 {
-       gboolean result = FALSE;
-       TnyDevice *device = modest_runtime_get_device();
-       if (tny_device_is_online (device))
-               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);  
-       }
-               
-       return result;
+       TnyConnectionStatus conn_status;
+       ConnectAndWaitData *data;
+                       
+       /* Ignore if reconnecting or disconnected */
+       conn_status = tny_account_get_connection_status (account);
+       if (conn_status == TNY_CONNECTION_STATUS_RECONNECTING ||
+           conn_status == TNY_CONNECTION_STATUS_DISCONNECTED)
+               return;
+
+       /* Remove the handler */
+       data = (ConnectAndWaitData *) user_data;
+       g_signal_handler_disconnect (account, data->handler);
+
+       /* Quit from wait loop */
+       quit_wait_loop (account, (ConnectAndWaitData *) user_data);
 }
 
-static void 
-set_account_to_online (TnyAccount *account)
+static void
+on_tny_camel_account_set_online_cb (TnyCamelAccount *account, 
+                                   gboolean canceled, 
+                                   GError *err, 
+                                   gpointer user_data)
 {
-       /* 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
+       /* Quit from wait loop */
+       quit_wait_loop (TNY_ACCOUNT (account), (ConnectAndWaitData *) user_data);
 }
 
 gboolean 
-modest_platform_connect_and_wait (GtkWindow *parent_window, TnyAccount *account)
+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();
+       ConnectAndWaitData *data = NULL;
+       gboolean device_online;
+       TnyDevice *device;
+       TnyConnectionStatus conn_status;
+       gboolean user_requested;
        
-       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);
-       }
+       device = modest_runtime_get_device();
+       device_online = tny_device_is_online (device);
 
-       /* 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); */
+       /* Whether the connection is user requested or automatically
+          requested, for example via D-Bus */
+       user_requested = (parent_window) ? TRUE : FALSE;
 
-       g_slice_free (UtilIdleData, data);
+       /* If there is no account check only the device status */
+       if (!account) {
+               if (device_online)
+                       return TRUE;
+               else
+                       return tny_maemo_conic_device_connect (TNY_MAEMO_CONIC_DEVICE (device), 
+                                                              NULL, user_requested);
+       }
 
-       const gboolean result = tny_device_is_online (device);
+       /* Return if the account is already connected */
+       conn_status = tny_account_get_connection_status (account);
+       if (device_online && conn_status == TNY_CONNECTION_STATUS_CONNECTED)
+               return TRUE;
 
-       if (result) {
-               set_account_to_online (account);
+       /* Create the helper */
+       data = g_slice_new0 (ConnectAndWaitData);
+       data->mutex = g_mutex_new ();
+       data->has_callback = FALSE;
+
+       /* Connect the device */
+       if (!device_online) {
+               /* Track account connection status changes */
+               data->handler = g_signal_connect (account, "connection-status-changed",                                     
+                                                 G_CALLBACK (on_connection_status_changed),
+                                                 data);
+               /* Try to connect the device */
+               device_online = tny_maemo_conic_device_connect (TNY_MAEMO_CONIC_DEVICE (device), 
+                                                               NULL, user_requested);
+
+               /* If the device connection failed then exit */
+               if (!device_online && data->handler)
+                       goto frees;
+       } else {
+               /* Force a reconnection of the account */
+               tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (account), TRUE, 
+                                             on_tny_camel_account_set_online_cb, data);
        }
 
-       return result;
+       /* Wait until the callback is executed */
+       g_mutex_lock (data->mutex);
+       if (!data->has_callback) {
+               data->wait_loop = g_main_loop_new (g_main_context_new (), FALSE);
+               gdk_threads_leave ();
+               g_mutex_unlock (data->mutex);
+               g_main_loop_run (data->wait_loop);
+               g_mutex_lock (data->mutex);
+               gdk_threads_enter ();
+       }
+       g_mutex_unlock (data->mutex);
+
+ frees:
+       if (data) {
+               if (g_signal_handler_is_connected (account, data->handler))
+                       g_signal_handler_disconnect (account, data->handler);
+               g_mutex_free (data->mutex);
+               g_main_loop_unref (data->wait_loop);
+               g_slice_free (ConnectAndWaitData, data);
+       }
+
+       conn_status = tny_account_get_connection_status (account);
+       return (conn_status == TNY_CONNECTION_STATUS_CONNECTED) ? TRUE: FALSE;
 }
 
 gboolean 
@@ -1108,39 +1197,6 @@ modest_platform_connect_and_wait_if_network_folderstore (GtkWindow *parent_windo
        return result;
 }
 
-gboolean 
-modest_platform_is_network_folderstore (TnyFolderStore *folder_store)
-{
-        TnyAccount *account = NULL;
-        gboolean result = TRUE;
-
-        g_return_val_if_fail(TNY_IS_FOLDER_STORE(folder_store), FALSE);
-
-        if (TNY_IS_FOLDER (folder_store)) {
-                /* Get the folder's parent account: */
-                account = tny_folder_get_account(TNY_FOLDER(folder_store));
-        } else if (TNY_IS_ACCOUNT (folder_store)) {
-                account = TNY_ACCOUNT(folder_store);
-                g_object_ref(account);
-        }
-
-        if (account != NULL) {
-                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: */
-                                result = FALSE;
-                        }
-                }
-                g_object_unref (account);
-        } else {
-                result = FALSE;
-        }
-
-        return result;
-}
-
 void
 modest_platform_run_sort_dialog (GtkWindow *parent_window,
                                 ModestSortDialogType type)
@@ -1149,8 +1205,13 @@ modest_platform_run_sort_dialog (GtkWindow *parent_window,
 
        /* Build dialog */
        dialog = hildon_sort_dialog_new (parent_window);
-       gtk_window_set_modal (GTK_WINDOW(dialog), TRUE);
-       
+       modest_window_mgr_set_modal (modest_runtime_get_window_mgr (),
+                                    GTK_WINDOW (dialog));
+
+       hildon_help_dialog_help_enable (GTK_DIALOG(dialog),
+                                       "applications_email_sort",
+                                       modest_maemo_utils_get_osso_context());
+
        /* Fill sort keys */
        switch (type) {
        case MODEST_SORT_HEADERS:
@@ -1160,13 +1221,15 @@ modest_platform_run_sort_dialog (GtkWindow *parent_window,
        }
        
        /* Free */
-       gtk_widget_destroy (GTK_WIDGET (dialog));
+       on_destroy_dialog (GTK_DIALOG(dialog));
 }
 
 
 gboolean 
 modest_platform_set_update_interval (guint minutes)
 {
+#ifdef MODEST_HAVE_LIBALARM
+       
        ModestConf *conf = modest_runtime_get_conf ();
        if (!conf)
                return FALSE;
@@ -1176,8 +1239,8 @@ modest_platform_set_update_interval (guint minutes)
        /* Delete any existing alarm,
         * because we will replace it: */
        if (alarm_cookie) {
-               /* TODO: What does the alarm_event_del() return value mean? */
-               alarm_event_del(alarm_cookie);
+               if (alarm_event_del(alarm_cookie) != 1)
+                       g_warning ("%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);
        }
@@ -1185,7 +1248,7 @@ modest_platform_set_update_interval (guint minutes)
        /* 0 means no updates: */
        if (minutes == 0)
                return TRUE;
-               
+       
      
        /* Register alarm: */
        
@@ -1245,83 +1308,164 @@ modest_platform_set_update_interval (guint minutes)
            
            return FALSE;
        }
-       
+#endif /* MODEST_HAVE_LIBALARM */      
        return TRUE;
 }
 
-GtkWidget * 
-modest_platform_get_global_settings_dialog ()
-{
-       return modest_maemo_global_settings_dialog_new ();
-}
-
 void 
-modest_platform_on_new_header_received (TnyHeader *header)
+modest_platform_on_new_headers_received (TnyList *header_list) 
 {
 #ifdef MODEST_HAVE_HILDON_NOTIFY
-       HildonNotification *not;
-       gchar *url = NULL;
-       TnyFolder *folder = NULL;
-
-       /* Create a new notification. TODO: per-mail data needed */
-       not = hildon_notification_new (tny_header_get_from (header),
-                                      tny_header_get_subject (header),
-                                      "qgn_list_messagin_mail_unread",
-                                      NULL);
-
-       folder = tny_header_get_folder (header);
-       url = g_strdup_printf ("%s/%s", 
-                              tny_folder_get_url_string (folder), 
-                              tny_header_get_uid (header));
-       g_object_unref (folder);
-
-       hildon_notification_add_dbus_action(not,
-                                           "default",
-                                           "Cancel",
-                                           MODEST_DBUS_SERVICE,
-                                           MODEST_DBUS_OBJECT,
-                                           MODEST_DBUS_IFACE,
-                                           MODEST_DBUS_METHOD_OPEN_MESSAGE,
-                                           G_TYPE_STRING, url,
-                                           -1);
-       g_free (url);
-       
-       /* Play sound SR-SND-18 */
-       hildon_notification_set_sound
-               (not, "/usr/share/sounds/ui-new_email.wav");
-       notify_notification_set_hint_int32 (NOTIFY_NOTIFICATION (not), "dialog-type", 4);
-
-       /* Set the led pattern */
-       notify_notification_set_hint_string(NOTIFY_NOTIFICATION (not), 
-                                           "led-pattern", 
-                                           "PatternCommunicationEmail");
-
-       /* 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");
+       HildonNotification *notification;
+       TnyIterator *iter;
+       GSList *notifications_list = NULL;
+
+       /* Get previous notifications ids */
+       notifications_list = modest_conf_get_list (modest_runtime_get_conf (), 
+                                                  MODEST_CONF_NOTIFICATION_IDS, 
+                                                  MODEST_CONF_VALUE_INT, NULL);
+
+       iter = tny_list_create_iterator (header_list);
+       while (!tny_iterator_is_done (iter)) {
+               gchar *url = NULL, *display_address = NULL,  *summary = NULL;
+               const gchar *display_date;
+               TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
+               TnyFolder *folder = tny_header_get_folder (header);
+               gboolean first_notification = TRUE;
+               gint notif_id;
+
+               /* constant string, don't free */
+               display_date = modest_text_utils_get_display_date (tny_header_get_date_received (header));
+
+               display_address = g_strdup(tny_header_get_from (header));
+               modest_text_utils_get_display_address (display_address); /* string is changed in-place */
                
-       g_object_unref (not);
+               summary = g_strdup_printf ("%s - %s", display_date, display_address);
+               notification = hildon_notification_new (summary,
+                                                       tny_header_get_subject (header),
+                                                       "qgn_list_messagin",
+                                                       "email.arrive");
+               /* Create the message URL */
+               url = g_strdup_printf ("%s/%s", tny_folder_get_url_string (folder), 
+                                      tny_header_get_uid (header));
+
+               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, url,
+                                                   -1);
+
+               /* Play sound if the user wants. Show the LED
+                  pattern. Show and play just one */
+               if (G_UNLIKELY (first_notification)) {
+                       first_notification = FALSE;
+                       if (modest_conf_get_bool (modest_runtime_get_conf (),
+                                                 MODEST_CONF_PLAY_SOUND_MSG_ARRIVE,
+                                                 NULL))  {
+                               notify_notification_set_hint_string(NOTIFY_NOTIFICATION (notification),
+                                                                   "sound-file", "/usr/share/sounds/ui-new_email.wav");
+                       }
+
+                       /* Set the led pattern */
+                       notify_notification_set_hint_int32 (NOTIFY_NOTIFICATION (notification),
+                                                           "dialog-type", 4);
+                       notify_notification_set_hint_string(NOTIFY_NOTIFICATION (notification),
+                                                           "led-pattern",
+                                                           "PatternCommunicationEmail");                       
+               }
+
+               /* Notify. We need to do this in an idle because this function
+                  could be called from a thread */
+               notify_notification_show (NOTIFY_NOTIFICATION (notification), NULL);
+
+               /* Save id in the list */
+               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 */
+               g_free (display_address);
+               g_free (summary);
+               g_free (url);
+               g_object_unref (folder);
+               g_object_unref (header);
+               tny_iterator_next (iter);
+       }
+       g_object_unref (iter);
+
+       /* 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);
+       
 #endif /*MODEST_HAVE_HILDON_NOTIFY*/
 }
 
+void
+modest_platform_remove_new_mail_notifications (void) 
+{
+#ifdef MODEST_HAVE_HILDON_NOTIFY
+       GSList *notif_list = NULL;
+
+       /* Get previous notifications ids */
+       notif_list = modest_conf_get_list (modest_runtime_get_conf (), 
+                                          MODEST_CONF_NOTIFICATION_IDS, 
+                                          MODEST_CONF_VALUE_INT, NULL);
+
+        while (notif_list) {
+               gint notif_id;
+               NotifyNotification *notif;
+
+               /* Nasty HACK to remove the notifications, set the id
+                  of the existing ones and then close them */
+               notif_id = GPOINTER_TO_INT(notif_list->data);
+               notif = notify_notification_new("dummy", NULL, NULL, NULL);
+               g_object_set(G_OBJECT(notif), "id", notif_id, NULL);
+
+               /* Close the notification, note that some ids could be
+                  already invalid, but we don't care because it does
+                  not fail */
+               notify_notification_close(notif, NULL);
+               g_object_unref(notif);
+
+               /* Delete the link, it's like going to the next */
+               notif_list = g_slist_delete_link (notif_list, notif_list);
+        }
+
+       /* Save the ids */
+       modest_conf_set_list (modest_runtime_get_conf (), MODEST_CONF_NOTIFICATION_IDS, 
+                             notif_list, MODEST_CONF_VALUE_INT, NULL);
+
+       g_slist_free (notif_list);
+
+#endif /* MODEST_HAVE_HILDON_NOTIFY */
+}
+
+
+
+GtkWidget * 
+modest_platform_get_global_settings_dialog ()
+{
+       return modest_maemo_global_settings_dialog_new ();
+}
 
 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
 
+       result = hildon_help_show (modest_maemo_utils_get_osso_context(),
+                                  help_id, HILDON_HELP_SHOW_DIALOG);
+       
        if (result != OSSO_OK) {
                gchar *error_msg;
                error_msg = g_strdup_printf ("FIXME The help topic %s could not be found", help_id); 
@@ -1337,7 +1481,9 @@ 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);
+       result = osso_rpc_run_with_defaults (modest_maemo_utils_get_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__);
@@ -1349,7 +1495,9 @@ 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);
+       result = osso_rpc_run_with_defaults (modest_maemo_utils_get_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__);
@@ -1407,24 +1555,14 @@ typedef struct
 #define NUMBER_OF_TRIES 10 /* Try approx every second, ten times. */
 
 static gboolean 
-on_timeout_check_account_is_online(gpointer user_data)
+on_timeout_check_account_is_online(CheckAccountIdleData* data)
 {
-       printf ("DEBUG: %s:\n", __FUNCTION__);
-       CheckAccountIdleData *data = (CheckAccountIdleData*)user_data;
-       
-       if (!data) {
-               g_warning ("%s: data is NULL.\n", __FUNCTION__);
-       }
-       
-       if (!(data->account)) {
-               g_warning ("%s: data->account is NULL.\n", __FUNCTION__);
-       }
+       gboolean stop_trying = FALSE;
+       g_return_val_if_fail (data && data->account, FALSE);
        
-       if (data && data->account) {
-               printf ("DEBUG: %s: tny_account_get_connection_status()==%d\n", __FUNCTION__, tny_account_get_connection_status (data->account));       
-       }
+       printf ("DEBUG: %s: tny_account_get_connection_status()==%d\n", __FUNCTION__,
+               tny_account_get_connection_status (data->account));     
        
-       gboolean stop_trying = FALSE;
        if (data && data->account && 
                /* We want to wait until TNY_CONNECTION_STATUS_INIT has changed to something else,
                 * after which the account is likely to be usable, or never likely to be usable soon: */
@@ -1433,14 +1571,11 @@ on_timeout_check_account_is_online(gpointer user_data)
                data->is_online = TRUE;
                
                stop_trying = TRUE;
-       }
-       else {
+       } else {
                /* Give up if we have tried too many times: */
-               if (data->count_tries >= NUMBER_OF_TRIES)
-               {
+               if (data->count_tries >= NUMBER_OF_TRIES) {
                        stop_trying = TRUE;
-               }
-               else {
+               } else {
                        /* Wait for another timeout: */
                        ++(data->count_tries);
                }
@@ -1507,7 +1642,7 @@ modest_platform_check_and_wait_for_account_is_online(TnyAccount *account)
        GMainContext *context = NULL; /* g_main_context_new (); */
        data->loop = g_main_loop_new (context, FALSE /* not running */);
 
-       g_timeout_add (1000, &on_timeout_check_account_is_online, data);
+       g_timeout_add (1000, (GSourceFunc)(on_timeout_check_account_is_online), data);
 
        /* This main loop will run until the idle handler has stopped it: */
        g_main_loop_run (data->loop);
@@ -1542,19 +1677,29 @@ on_cert_dialog_response (GtkDialog *dialog, gint response_id,  const gchar* cert
 
 
 gboolean
-modest_platform_run_certificate_conformation_dialog (const gchar* server_name,
+modest_platform_run_certificate_confirmation_dialog (const gchar* server_name,
                                                     const gchar *certificate)
 {
        GtkWidget *note;
        gint response;
-       GtkWindow *main_win =
-               (GtkWindow*)modest_window_mgr_get_main_window (modest_runtime_get_window_mgr());
+       ModestWindow *main_win;
+       
+       if (!modest_window_mgr_main_window_exists (modest_runtime_get_window_mgr())) {
+               g_warning ("%s: don't show dialogs if there's no main window; assuming 'Cancel'",
+                          __FUNCTION__);
+               return FALSE;
+       }
 
+       /* don't create it */
+       main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr(), FALSE);
+       g_return_val_if_fail (main_win, FALSE); /* should not happen */
+       
+       
        gchar *question = g_strdup_printf (_("mcen_nc_unknown_certificate"),
                                           server_name);
        
        note = hildon_note_new_confirmation_add_buttons  (
-               main_win,
+               GTK_WINDOW(main_win),
                question,
                _("mcen_bd_dialog_ok"),     GTK_RESPONSE_OK,
                _("mcen_bd_view"),          GTK_RESPONSE_HELP,   /* abusing this... */
@@ -1564,22 +1709,31 @@ modest_platform_run_certificate_conformation_dialog (const gchar* server_name,
        g_signal_connect (G_OBJECT(note), "response", 
                          G_CALLBACK(on_cert_dialog_response),
                          (gpointer) certificate);
+       
+       modest_window_mgr_set_modal (modest_runtime_get_window_mgr (),
+                                    GTK_WINDOW (note));
        response = gtk_dialog_run(GTK_DIALOG(note));
 
-       gtk_widget_destroy(GTK_WIDGET(note));
+       on_destroy_dialog (GTK_DIALOG(note));
        g_free (question);
        
-       return response;
+       return response == GTK_RESPONSE_OK;
 }
-       
-
 
 gboolean
 modest_platform_run_alert_dialog (const gchar* prompt, 
                                  gboolean is_question)
 {      
-       ModestWindow *main_window = 
-               modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ());
+       ModestWindow *main_win; 
+
+       if (!modest_window_mgr_main_window_exists (modest_runtime_get_window_mgr())) {
+               g_warning ("%s:\n'%s'\ndon't show dialogs if there's no main window;"
+                          " assuming 'Cancel' for questions, 'Ok' otherwise", prompt, __FUNCTION__);
+               return is_question ? FALSE : TRUE;
+       }
+
+       main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (), FALSE);
+       g_return_val_if_fail (main_win, FALSE); /* should not happen */
        
        gboolean retval = TRUE;
        if (is_question) {
@@ -1587,17 +1741,283 @@ modest_platform_run_alert_dialog (const gchar* prompt,
                 * when it is a question.
                 * Obviously, we need tinymail to use more specific error codes instead,
                 * so we know what buttons to show. */
-               GtkWidget *dialog = GTK_WIDGET (hildon_note_new_confirmation (GTK_WINDOW (main_window), 
+               GtkWidget *dialog = GTK_WIDGET (hildon_note_new_confirmation (GTK_WINDOW (main_win), 
                                                                              prompt));
+               modest_window_mgr_set_modal (modest_runtime_get_window_mgr (),
+                                            GTK_WINDOW (dialog));
+               
                const int response = gtk_dialog_run (GTK_DIALOG (dialog));
                retval = (response == GTK_RESPONSE_YES) || (response == GTK_RESPONSE_OK);
                
-               gtk_widget_destroy (dialog);
-               
+               on_destroy_dialog (GTK_DIALOG(dialog));         
        } else {
                /* Just show the error text and use the default response: */
-               modest_maemo_show_information_note_and_forget(GTK_WINDOW (main_window), 
-                                                             prompt);
+               modest_platform_run_information_dialog (GTK_WINDOW (main_win), 
+                                                       prompt);
        }
        return retval;
 }
+
+/***************/
+typedef struct {
+       GtkWindow *parent_window;
+       ModestConnectedPerformer callback;
+       TnyAccount *account;
+       gpointer user_data;
+       gchar *iap;
+       TnyDevice *device;
+} OnWentOnlineInfo;
+static void 
+on_went_online_info_free (OnWentOnlineInfo *info)
+{
+       /* And if we cleanup, we DO cleanup  :-)  */
+       
+       if (info->device)
+               g_object_unref (info->device);
+       if (info->iap)
+               g_free (info->iap);
+       if (info->parent_window)
+               g_object_unref (info->parent_window);
+       if (info->account)
+               g_object_unref (info->account);
+       
+       g_slice_free (OnWentOnlineInfo, info);
+       
+       /* We're done ... */
+       
+       return;
+}
+static void
+on_account_went_online (TnyCamelAccount *account, gboolean canceled, GError *err, gpointer user_data)
+{
+       OnWentOnlineInfo *info = (OnWentOnlineInfo *) user_data;
+       /* Now it's really time to callback to the caller. If going online didn't succeed,
+        * err will be set. We don't free it, Tinymail does that! If a cancel happened,
+        * canceled will be set. Etcetera etcetera. */
+       
+       if (info->callback) {
+               info->callback (canceled, err, info->parent_window, info->account, info->user_data);
+       }
+       
+       /* This is our last call, we must cleanup here if we didn't yet do that */
+       on_went_online_info_free (info);
+       
+       return;
+}
+static void
+on_conic_device_went_online (TnyMaemoConicDevice *device, const gchar* iap_id, gboolean canceled, GError *err, gpointer user_data)
+{
+       OnWentOnlineInfo *info = (OnWentOnlineInfo *) user_data;
+       info->iap = g_strdup (iap_id);
+       
+       if (canceled || err || !info->account) {
+       
+               /* If there's a problem or if there's no account (then that's it for us, we callback
+                * the caller's callback now. He'll have to handle err or canceled, of course.
+                * We are not really online, as the account is not really online here ... */    
+               
+               /* We'll use the err and the canceled of this cb. TnyMaemoConicDevice delivered us
+                * this info. We don't cleanup err, Tinymail does that! */
+               
+               if (info->callback) {
+                       
+                       /* info->account can be NULL here, this means that the user did not
+                        * provide a nice account instance. We'll assume that the user knows
+                        * what he's doing and is happy with just the device going online. 
+                        * 
+                        * We can't do magic, we don't know what account the user wants to
+                        * see going online. So just the device goes online, end of story */
+                       
+                       info->callback (canceled, err, info->parent_window, info->account, info->user_data);
+               }
+               
+       } else if (info->account) {
+               
+               /* If there's no problem and if we have an account, we'll put the account
+                * online too. When done, the callback of bringing the account online
+                * will callback the caller's callback. This is the most normal case. */
+               info->device = TNY_DEVICE (g_object_ref (device));
+               
+               tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (info->account), TRUE,
+                                             on_account_went_online, info);
+               
+               /* The on_account_went_online cb frees up the info, go look if you
+                * don't believe me! (so we return here) */
+               
+               return;
+       }
+       
+       /* We cleanup if we are not bringing the account online too */
+       on_went_online_info_free (info);
+       return; 
+}
+       
+void 
+modest_platform_connect_and_perform (GtkWindow *parent_window, 
+                                    TnyAccount *account, 
+                                    ModestConnectedPerformer callback, 
+                                    gpointer user_data)
+{
+       gboolean device_online;
+       TnyDevice *device;
+       TnyConnectionStatus conn_status;
+       OnWentOnlineInfo *info;
+       gboolean user_requested;
+       
+       device = modest_runtime_get_device();
+       device_online = tny_device_is_online (device);
+
+       /* Whether the connection is user requested or automatically
+          requested, for example via D-Bus */
+       user_requested = (parent_window) ? TRUE : FALSE;
+
+       /* If there is no account check only the device status */
+       if (!account) {
+               
+               if (device_online) {
+                       /* We promise to instantly perform the callback, so ... */
+                       if (callback) {
+                               callback (FALSE, NULL, parent_window, account, user_data);
+                       }
+                       
+               } else {
+                       
+                       info = g_slice_new0 (OnWentOnlineInfo);
+                       
+                       info->iap = NULL;
+                       info->device = NULL;
+                       info->account = NULL;
+               
+                       if (parent_window)
+                               info->parent_window = (GtkWindow *) g_object_ref (parent_window);
+                       else
+                               info->parent_window = NULL;
+                       info->user_data = user_data;
+                       info->callback = callback;
+               
+                       tny_maemo_conic_device_connect_async (TNY_MAEMO_CONIC_DEVICE (device), NULL,
+                                                             user_requested, on_conic_device_went_online, 
+                                                             info);
+                       /* We'll cleanup in on_conic_device_went_online */
+               }
+               /* The other code has no more reason to run. This is all that we can do for the
+                * caller (he should have given us a nice and clean account instance!). We
+                * can't do magic, we don't know what account he intends to bring online. So
+                * we'll just bring the device online (and await his false bug report). */
+               
+               return;
+       }
+       
+       /* Return if the account is already connected */
+       
+       conn_status = tny_account_get_connection_status (account);
+       if (device_online && conn_status == TNY_CONNECTION_STATUS_CONNECTED) {
+               /* We promise to instantly perform the callback, so ... */
+               if (callback) {
+                       callback (FALSE, NULL, parent_window, account, user_data);
+               }
+               
+               return;
+       }
+       
+       /* Else, we are in a state that requires that we go online before we
+        * call the caller's callback. */
+       
+       info = g_slice_new0 (OnWentOnlineInfo);
+       
+       info->device = NULL;
+       info->iap = NULL;
+       info->account = TNY_ACCOUNT (g_object_ref (account));
+       
+       if (parent_window)
+               info->parent_window = (GtkWindow *) g_object_ref (parent_window);
+       else
+               info->parent_window = NULL;
+       
+       /* So we'll put the callback away for later ... */
+       
+       info->user_data = user_data;
+       info->callback = callback;
+       
+       if (!device_online) {
+               /* If also the device is offline, then we connect both the device 
+                * and the account */
+               
+               tny_maemo_conic_device_connect_async (TNY_MAEMO_CONIC_DEVICE (device), NULL,
+                                                     user_requested, on_conic_device_went_online, 
+                                                     info);
+               
+       } else {
+               
+               /* If the device is online, we'll just connect the account */
+               
+               tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (account), TRUE, 
+                                             on_account_went_online, info);
+       }
+       /* The info gets freed by on_account_went_online or on_conic_device_went_online
+        * in both situations, go look if you don't believe me! */
+       
+       return;
+}
+
+void
+modest_platform_connect_if_remote_and_perform (GtkWindow *parent_window, 
+                                                           TnyFolderStore *folder_store, 
+                                                           ModestConnectedPerformer callback, 
+                                                           gpointer user_data)
+{
+       TnyAccount *account = NULL;
+       
+       if (!folder_store) {
+               /* We promise to instantly perform the callback, so ... */
+               if (callback) {
+                       callback (FALSE, NULL, parent_window, NULL, user_data);
+               }
+               return; 
+               
+               /* Original comment: Maybe it is something local. */
+               /* PVH's comment: maybe we should KNOW this in stead of assuming? */
+               
+       } else if (TNY_IS_FOLDER (folder_store)) {
+               /* Get the folder's parent account: */
+               account = tny_folder_get_account(TNY_FOLDER (folder_store));
+       } else if (TNY_IS_ACCOUNT (folder_store)) {
+               /* Use the folder store as an account: */
+               account = TNY_ACCOUNT (folder_store);
+       }
+       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 IS a local account like a maildir account, which does not require 
+                        * a connection. (original comment had a vague assumption in its language
+                        * usage. There's no assuming needed, this IS what it IS: a local account), */
+                       /* We promise to instantly perform the callback, so ... */
+                       if (callback) {
+                               callback (FALSE, NULL, parent_window, account, user_data);
+                       }
+                       
+                       return;
+               }
+       }
+       modest_platform_connect_and_perform (parent_window, account, callback, user_data);
+       return;
+}