Fixes the new folder dialog in Diablo
[modest] / src / maemo / modest-platform.c
index 9b1fdb7..5472fbe 100644 (file)
@@ -29,6 +29,7 @@
 
 #include <config.h>
 #include <glib/gi18n.h>
+#include <modest-defs.h>
 #include <modest-platform.h>
 #include <modest-runtime.h>
 #include <modest-main-window.h>
@@ -43,6 +44,8 @@
 #include <tny-maemo-conic-device.h>
 #include <tny-simple-list.h>
 #include <tny-folder.h>
+#include <tny-error.h>
+#include <tny-merge-folder.h>
 #include <tny-camel-imap-store-account.h>
 #include <tny-camel-pop-store-account.h>
 #include <gtk/gtkicontheme.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>
+#include <modest-account-settings-dialog.h>
+#include <easysetup/modest-easysetup-wizard-dialog.h>
+#include "modest-hildon-sort-dialog.h"
+#include <hildon/hildon-sound.h>
+#include <osso-mem.h>
+#include "widgets/modest-details-dialog.h"
+
+#ifdef MODEST_HAVE_MCE
+#include <mce/dbus-names.h>
+#endif /*MODEST_HAVE_MCE*/
 
 #ifdef MODEST_HAVE_ABOOK
 #include <libosso-abook/osso-abook.h>
@@ -64,6 +78,8 @@
 
 #define HILDON_OSSO_URI_ACTION "uri-action"
 #define URI_ACTION_COPY "copy:"
+#define MODEST_NEW_MAIL_SOUND_FILE "/usr/share/sounds/ui-new_email.wav"
+#define MODEST_NEW_MAIL_LIGHTING_PATTERN "PatternCommunicationEmail"
 
 static void    
 on_modest_conf_update_interval_changed (ModestConf* self, 
@@ -158,7 +174,7 @@ modest_platform_init (int argc, char *argv[])
 
        /* 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, 
@@ -233,14 +249,15 @@ modest_platform_get_file_icon_name (const gchar* name, const gchar* mime_type,
        gchar *icon_name  = NULL;
        gchar **icons, **cursor;
        
-       if (!mime_type || !g_ascii_strcasecmp (mime_type, "application/octet-stream")) 
+       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")) {
@@ -257,7 +274,7 @@ 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;
 }
 
@@ -292,28 +309,34 @@ modest_platform_activate_uri (const gchar *uri)
        g_return_val_if_fail (uri, FALSE);
        if (!uri)
                return FALSE;
-       
-       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;
+
+       /* 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;
+                       }
                }
-       }
+               
+               /* if we could not open it with email, try something else */
+               if (!result)
+                       result = checked_hildon_uri_open (uri, NULL);   
+       } 
        
-       /* 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;
 }
@@ -324,8 +347,8 @@ 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); 
+       
+       uri_path = gnome_vfs_get_uri_from_local_path (path);    
        con = osso_get_dbus_connection (modest_maemo_utils_get_osso_context());
        
        if (mime_type)
@@ -333,7 +356,7 @@ modest_platform_activate_file (const gchar *path, const gchar *mime_type)
        if (result != 1)
                result = hildon_mime_open_file (con, uri_path);
        if (result != 1)
-               modest_platform_run_information_dialog (NULL, _("mcen_ni_noregistered_viewer"));
+               modest_platform_run_information_dialog (NULL, _("mcen_ni_noregistered_viewer"), FALSE);
        
        return result != 1;
 }
@@ -380,6 +403,7 @@ activate_uri_popup_item (GtkMenuItem *menu_item,
                        action_name += strlen ("mailto:");
                
                gtk_clipboard_set_text (clipboard, action_name, strlen (action_name));
+               modest_platform_information_banner (NULL, NULL, _CS("ecoc_ib_edwin_copied"));
                return; /* we're done */
        }
        
@@ -405,38 +429,47 @@ modest_platform_show_uri_popup (const gchar *uri)
 
        if (uri == NULL)
                return FALSE;
-
+       
        actions_list = hildon_uri_get_actions_by_uri (uri, -1, NULL);
-       if (actions_list != NULL) {
-               GSList *node;
+       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);
@@ -452,13 +485,13 @@ modest_platform_show_uri_popup (const gchar *uri)
        } else {
                hildon_banner_show_information (NULL, NULL, _("mcen_ib_unsupported_link"));
        }
-
+       
        return TRUE;
 }
 
 
 GdkPixbuf*
-modest_platform_get_icon (const gchar *name)
+modest_platform_get_icon (const gchar *name, guint icon_size)
 {
        GError *err = NULL;
        GdkPixbuf* pixbuf = NULL;
@@ -472,20 +505,8 @@ modest_platform_get_icon (const gchar *name)
        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) {
-                       g_printerr ("modest: error loading icon '%s': %s\n",
-                                   name, err->message);
-                       g_error_free (err);
-                       return NULL;
-               }
-               return pixbuf;
-       }
-#endif /* */
        current_theme = gtk_icon_theme_get_default ();
-       pixbuf = gtk_icon_theme_load_icon (current_theme, name, 26,
+       pixbuf = gtk_icon_theme_load_icon (current_theme, name, icon_size,
                                           GTK_ICON_LOOKUP_NO_SVG,
                                           &err);
        if (!pixbuf) {
@@ -514,6 +535,7 @@ entry_insert_text (GtkEditable *editable,
 
        chars = gtk_editable_get_chars (editable, 0, -1);
        chars_length = g_utf8_strlen (chars, -1);
+       g_free (chars);
 
        /* Show WID-INF036 */
        if (chars_length >= 20) {
@@ -570,140 +592,6 @@ entry_changed (GtkEditable *editable,
        g_free (chars);
 }
 
-static void
-launch_sort_headers_dialog (GtkWindow *parent_window,
-                           HildonSortDialog *dialog)
-{
-       ModestHeaderView *header_view = NULL;
-       GList *cols = 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)) {
-               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;
-       
-       /* Add sorting keys */
-       cols = modest_header_view_get_columns (header_view);
-       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"));
-       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_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)))));
-       /* Launch dialogs */
-       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_MASK)
-                               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_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 */
-       g_list_free(cols);      
-}
-
 
 
 static void
@@ -714,23 +602,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"));
@@ -780,6 +685,9 @@ modest_platform_run_folder_name_dialog (GtkWindow *parent_window,
                gtk_entry_set_text (GTK_ENTRY (entry), suggested_name);
        else
                gtk_entry_set_text (GTK_ENTRY (entry), _("mcen_ia_default_folder_name"));
+       gtk_entry_set_width_chars (GTK_ENTRY (entry),
+                                  MAX (g_utf8_strlen (gtk_entry_get_text (GTK_ENTRY (entry)), -1),
+                                       g_utf8_strlen (_("mcen_ia_default_folder_name"), -1)));
        gtk_entry_select_region (GTK_ENTRY (entry), 0, -1);
 
        /* Connect to the response method to avoid closing the dialog
@@ -799,18 +707,23 @@ modest_platform_run_folder_name_dialog (GtkWindow *parent_window,
                          G_CALLBACK (entry_changed),
                          dialog);
 
+
+       /* Some locales like pt_BR need this to get the full window
+          title shown */
+       gtk_widget_set_size_request (GTK_WIDGET (dialog), 300, -1);
+
        /* Create the hbox */
        hbox = gtk_hbox_new (FALSE, 12);
-       gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, FALSE, 0);
-       gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, FALSE, 0);
+       gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+       gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
 
        /* Add hbox to dialog */
        gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), 
                            hbox, FALSE, FALSE, 0);
-       
-       gtk_widget_show_all (GTK_WIDGET(GTK_DIALOG(dialog)->vbox));
-       gtk_window_set_transient_for (GTK_WINDOW (dialog), parent_window);
-       
+       modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), 
+                                    GTK_WINDOW (dialog), GTK_WINDOW (parent_window));
+       gtk_widget_show_all (GTK_WIDGET(dialog));
+               
        result = gtk_dialog_run (GTK_DIALOG(dialog));
        if (result == GTK_RESPONSE_ACCEPT)
                *folder_name = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)));
@@ -825,11 +738,12 @@ modest_platform_run_folder_name_dialog (GtkWindow *parent_window,
 
 gint
 modest_platform_run_new_folder_dialog (GtkWindow *parent_window,
-                                      TnyFolderStore *parent_folder,
+                                      TnyFolderStore *suggested_parent,
                                       gchar *suggested_name,
-                                      gchar **folder_name)
+                                      gchar **folder_name,
+                                      TnyFolderStore **parent_folder)
 {
-       gchar *real_suggested_name = NULL;
+       gchar *real_suggested_name = NULL, *tmp = NULL;
        gint result;
 
        if(suggested_name == NULL)
@@ -848,7 +762,7 @@ 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,
+                       exists = modest_tny_folder_has_subfolder_with_name (suggested_parent,
                                                                            real_suggested_name,
                                                                            TRUE);
 
@@ -865,15 +779,22 @@ modest_platform_run_new_folder_dialog (GtkWindow *parent_window,
                real_suggested_name = suggested_name;
        }
 
+       tmp = g_strconcat (_("mcen_fi_new_folder_name"), ":", NULL);
        result = modest_platform_run_folder_name_dialog (parent_window, 
-                                                        parent_folder,
+                                                        suggested_parent,
                                                         _("mcen_ti_new_folder"),
-                                                        _("mcen_fi_new_folder_name"),
+                                                        tmp,
                                                         real_suggested_name,
                                                         folder_name);
+       g_free (tmp);
+
        if (suggested_name == NULL)
                g_free(real_suggested_name);
 
+       if (parent_folder != NULL) {
+               *parent_folder = suggested_parent?g_object_ref (suggested_parent): NULL;
+       }
+
        return result;
 }
 
@@ -896,9 +817,16 @@ modest_platform_run_rename_folder_dialog (GtkWindow *parent_window,
 
 
 static void
-on_destroy_dialog (GtkDialog *dialog)
+on_destroy_dialog (GtkWidget *dialog)
 {
-       gtk_widget_destroy (GTK_WIDGET(dialog));
+       /* This could happen when the dialogs get programatically
+          hidden or destroyed (for example when closing the
+          application while a dialog is being shown) */
+       if (!GTK_IS_WIDGET (dialog))
+               return;
+
+       gtk_widget_destroy (dialog);
+
        if (gtk_events_pending ())
                gtk_main_iteration ();
 }
@@ -912,62 +840,64 @@ modest_platform_run_confirmation_dialog (GtkWindow *parent_window,
        
        dialog = hildon_note_new_confirmation (parent_window, message);
        modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), 
-                                    GTK_WINDOW (dialog));
+                                    GTK_WINDOW (dialog), GTK_WINDOW (parent_window));
 
        response = gtk_dialog_run (GTK_DIALOG (dialog));
 
-       on_destroy_dialog (GTK_DIALOG(dialog));
-       
-       while (gtk_events_pending ())
-               gtk_main_iteration ();
+       on_destroy_dialog (dialog);
 
        return response;
 }
-       
+
 gint
-modest_platform_run_yes_no_dialog (GtkWindow *parent_window,
-                                  const gchar *message)
+modest_platform_run_confirmation_dialog_with_buttons (GtkWindow *parent_window,
+                                                     const gchar *message,
+                                                     const gchar *button_accept,
+                                                     const gchar *button_cancel)
 {
        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,
+                                                          button_accept, GTK_RESPONSE_ACCEPT,
+                                                          button_cancel, GTK_RESPONSE_CANCEL,
                                                           NULL);
-       modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (dialog));
+       modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), 
+                                    GTK_WINDOW (dialog), GTK_WINDOW (parent_window));
+
        response = gtk_dialog_run (GTK_DIALOG (dialog));
-       
-       on_destroy_dialog (GTK_DIALOG(dialog));
 
-       while (gtk_events_pending ())
-               gtk_main_iteration ();
+       on_destroy_dialog (dialog);
 
        return response;
 }
-
-
-
+       
 void
 modest_platform_run_information_dialog (GtkWindow *parent_window,
-                                       const gchar *message)
+                                       const gchar *message,
+                                       gboolean block)
 {
        GtkWidget *note;
        
        note = hildon_note_new_information (parent_window, message);
-       modest_window_mgr_set_modal (modest_runtime_get_window_mgr (),
-                                    GTK_WINDOW (note));
+       if (block)
+               modest_window_mgr_set_modal (modest_runtime_get_window_mgr (),
+                                            GTK_WINDOW (note), GTK_WINDOW (parent_window));
+       
+       if (block) {
+               gtk_dialog_run (GTK_DIALOG (note));
        
-       g_signal_connect_swapped (note,
-                                 "response", 
-                                 G_CALLBACK (on_destroy_dialog),
-                                 note);
+               on_destroy_dialog (note);
+       } else {
+               g_signal_connect_swapped (note,
+                                         "response", 
+                                         G_CALLBACK (on_destroy_dialog),
+                                         note);
 
-       gtk_widget_show_all (note);
+               gtk_widget_show_all (note);
+       }
 }
 
-
-
 typedef struct _ConnectAndWaitData {
        GMutex *mutex;
        GMainLoop *wait_loop;
@@ -1030,16 +960,22 @@ modest_platform_connect_and_wait (GtkWindow *parent_window,
        gboolean device_online;
        TnyDevice *device;
        TnyConnectionStatus conn_status;
+       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)
                        return TRUE;
                else
-                       return tny_maemo_conic_device_connect (TNY_MAEMO_CONIC_DEVICE (device), NULL);
+                       return tny_maemo_conic_device_connect (TNY_MAEMO_CONIC_DEVICE (device), 
+                                                              NULL, user_requested);
        }
 
        /* Return if the account is already connected */
@@ -1059,7 +995,8 @@ modest_platform_connect_and_wait (GtkWindow *parent_window,
                                                  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);
+               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)
@@ -1131,64 +1068,18 @@ 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)
+GtkWidget *
+modest_platform_create_sort_dialog       (GtkWindow *parent_window)
 {
-       GtkWidget *dialog = NULL;
+       GtkWidget *dialog;
 
-       /* Build dialog */
-       dialog = hildon_sort_dialog_new (parent_window);
-       modest_window_mgr_set_modal (modest_runtime_get_window_mgr (),
-                                    GTK_WINDOW (dialog));
+       dialog = modest_hildon_sort_dialog_new (parent_window);
 
        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:
-               launch_sort_headers_dialog (parent_window, 
-                                           HILDON_SORT_DIALOG(dialog));
-               break;
-       }
-       
-       /* Free */
-       on_destroy_dialog (GTK_DIALOG(dialog));
+       return dialog;
 }
 
 
@@ -1240,8 +1131,9 @@ modest_platform_set_update_interval (guint minutes)
         * 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.)
+        * ALARM_EVENT_CONNECTED will prevent the alarm from being called in case that the device is offline
          */
-       event->flags = ALARM_EVENT_NO_DIALOG | ALARM_EVENT_ACTIVATION;
+       event->flags = ALARM_EVENT_NO_DIALOG | ALARM_EVENT_ACTIVATION | ALARM_EVENT_CONNECTED;
        
        alarm_cookie = alarm_event_add (event);
 
@@ -1279,10 +1171,73 @@ modest_platform_set_update_interval (guint minutes)
        return TRUE;
 }
 
+void
+modest_platform_push_email_notification(void)
+{
+       gboolean play_sound;
+       ModestWindow *main_window;
+       gboolean screen_on = TRUE, app_in_foreground;
+
+       /* Check whether or not we should play a sound */
+       play_sound = modest_conf_get_bool (modest_runtime_get_conf (),
+                                          MODEST_CONF_PLAY_SOUND_MSG_ARRIVE,
+                                          NULL);
+
+       /* Get the screen status */
+       main_window = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (), FALSE);
+       if (main_window)
+               screen_on = modest_main_window_screen_is_on (MODEST_MAIN_WINDOW (main_window));
+
+       /* Get the window status */
+       app_in_foreground = hildon_program_get_is_topmost (hildon_program_get_instance ());
+
+       /* If the screen is on and the app is in the
+          foreground we don't show anything */
+       if (!(screen_on && app_in_foreground)) {
+               /* Play a sound */
+               if (play_sound)
+                       hildon_play_system_sound (MODEST_NEW_MAIL_SOUND_FILE);
+
+               /* Activate LED. This must be deactivated by
+                  modest_platform_remove_new_mail_notifications */
+#ifdef MODEST_HAVE_MCE
+               osso_rpc_run_system (modest_maemo_utils_get_osso_context (),
+                                    MCE_SERVICE,
+                                    MCE_REQUEST_PATH,
+                                    MCE_REQUEST_IF,
+                                    MCE_ACTIVATE_LED_PATTERN,
+                                    NULL,
+                                    DBUS_TYPE_STRING, MODEST_NEW_MAIL_LIGHTING_PATTERN,
+                                    DBUS_TYPE_INVALID);
+#endif
+       }
+}
+
 void 
-modest_platform_on_new_headers_received (TnyList *header_list) 
+modest_platform_on_new_headers_received (TnyList *header_list,
+                                        gboolean show_visual)
 {
+       g_return_if_fail (TNY_IS_LIST(header_list));
+
+       if (tny_list_get_length(header_list) == 0) {
+               g_warning ("%s: header list is empty", __FUNCTION__);
+               return;
+       }
+       
+       if (!show_visual) {
+                modest_platform_push_email_notification ();
+               /* We do a return here to avoid indentation with an else */
+               return;
+       }
+
 #ifdef MODEST_HAVE_HILDON_NOTIFY
+       gboolean play_sound;
+
+       /* Check whether or not we should play a sound */
+       play_sound = modest_conf_get_bool (modest_runtime_get_conf (),
+                                          MODEST_CONF_PLAY_SOUND_MSG_ARRIVE,
+                                          NULL);
+
        HildonNotification *notification;
        TnyIterator *iter;
        GSList *notifications_list = NULL;
@@ -1300,21 +1255,26 @@ modest_platform_on_new_headers_received (TnyList *header_list)
                TnyFolder *folder = tny_header_get_folder (header);
                gboolean first_notification = TRUE;
                gint notif_id;
+               gchar *str;
 
                /* 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));
+               display_address = tny_header_dup_from (header);
                modest_text_utils_get_display_address (display_address); /* string is changed in-place */
                
                summary = g_strdup_printf ("%s - %s", display_date, display_address);
+               str = tny_header_dup_subject (header);
                notification = hildon_notification_new (summary,
-                                                       tny_header_get_subject (header),
+                                                       str,
                                                        "qgn_list_messagin",
                                                        "email.arrive");
+               g_free (str);
                /* Create the message URL */
+               str = tny_header_dup_uid (header);
                url = g_strdup_printf ("%s/%s", tny_folder_get_url_string (folder), 
-                                      tny_header_get_uid (header));
+                                      str);
+               g_free (str);
 
                hildon_notification_add_dbus_action(notification,
                                                    "default",
@@ -1330,11 +1290,9 @@ modest_platform_on_new_headers_received (TnyList *header_list)
                   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))  {
+                       if (play_sound)  {
                                notify_notification_set_hint_string(NOTIFY_NOTIFICATION (notification),
-                                                                   "sound-file", "/usr/share/sounds/ui-new_email.wav");
+                                                                   "sound-file", MODEST_NEW_MAIL_SOUND_FILE);
                        }
 
                        /* Set the led pattern */
@@ -1342,7 +1300,7 @@ modest_platform_on_new_headers_received (TnyList *header_list)
                                                            "dialog-type", 4);
                        notify_notification_set_hint_string(NOTIFY_NOTIFICATION (notification),
                                                            "led-pattern",
-                                                           "PatternCommunicationEmail");                       
+                                                           MODEST_NEW_MAIL_LIGHTING_PATTERN);                  
                }
 
                /* Notify. We need to do this in an idle because this function
@@ -1376,8 +1334,22 @@ modest_platform_on_new_headers_received (TnyList *header_list)
 }
 
 void
-modest_platform_remove_new_mail_notifications (void) 
+modest_platform_remove_new_mail_notifications (gboolean only_visuals) 
 {
+       if (only_visuals) {
+#ifdef MODEST_HAVE_MCE
+               osso_rpc_run_system (modest_maemo_utils_get_osso_context (),
+                                    MCE_SERVICE,
+                                    MCE_REQUEST_PATH,
+                                    MCE_REQUEST_IF,
+                                    MCE_DEACTIVATE_LED_PATTERN,
+                                    NULL,
+                                    DBUS_TYPE_STRING, MODEST_NEW_MAIL_LIGHTING_PATTERN,
+                                    DBUS_TYPE_INVALID);
+#endif
+               return;
+       }
+
 #ifdef MODEST_HAVE_HILDON_NOTIFY
        GSList *notif_list = NULL;
 
@@ -1480,7 +1452,6 @@ modest_platform_create_folder_view (TnyFolderStoreQuery *query)
        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),
@@ -1489,12 +1460,63 @@ modest_platform_create_folder_view (TnyFolderStoreQuery *query)
        return widget;
 }
 
-void 
+void
+banner_finish (gpointer data, GObject *object)
+{
+       ModestWindowMgr *mgr = (ModestWindowMgr *) data;
+       modest_window_mgr_unregister_banner (mgr);
+       g_object_unref (mgr);
+}
+
+void
 modest_platform_information_banner (GtkWidget *parent,
                                    const gchar *icon_name,
                                    const gchar *text)
 {
-       hildon_banner_show_information (parent, icon_name, text);
+       GtkWidget *banner, *banner_parent = NULL;
+       ModestWindowMgr *mgr = modest_runtime_get_window_mgr ();
+
+       if (modest_window_mgr_get_num_windows (mgr) == 0)
+               return;
+
+       if (parent && GTK_IS_WINDOW (parent)) {
+               /* If the window is the active one then show the
+                  banner on top of this window */
+               if (gtk_window_is_active (GTK_WINDOW (parent)))
+                       banner_parent = parent;
+               /* If the window is not the topmost but it's visible
+                  (it's minimized for example) then show the banner
+                  with no parent */
+               else if (GTK_WIDGET_VISIBLE (parent))
+                       banner_parent = NULL;
+               /* If the window is hidden (like the main window when
+                  running in the background) then do not show
+                  anything */
+               else 
+                       return;
+       }
+
+
+       banner = hildon_banner_show_information (banner_parent, icon_name, text);
+
+       modest_window_mgr_register_banner (mgr);
+       g_object_ref (mgr);
+       g_object_weak_ref ((GObject *) banner, banner_finish, mgr);
+}
+
+void
+modest_platform_information_banner_with_timeout (GtkWidget *parent,
+                                                const gchar *icon_name,
+                                                const gchar *text,
+                                                gint timeout)
+{
+       GtkWidget *banner;
+
+       if (modest_window_mgr_get_num_windows (modest_runtime_get_window_mgr ()) == 0)
+               return;
+
+       banner = hildon_banner_show_information (parent, icon_name, text);
+       hildon_banner_set_timeout(HILDON_BANNER(banner), timeout);
 }
 
 GtkWidget *
@@ -1506,6 +1528,13 @@ modest_platform_animation_banner (GtkWidget *parent,
 
        g_return_val_if_fail (text != NULL, NULL);
 
+       if (modest_window_mgr_get_num_windows (modest_runtime_get_window_mgr ()) == 0)
+               return NULL;
+
+       /* If the parent is not visible then do not show */
+       if (parent && !GTK_WIDGET_VISIBLE (parent))
+               return NULL;
+
        inf_note = hildon_banner_show_animation (parent, animation_name, text);
 
        return inf_note;
@@ -1574,6 +1603,8 @@ on_timeout_check_account_is_online(CheckAccountIdleData* data)
 gboolean
 modest_platform_check_and_wait_for_account_is_online(TnyAccount *account)
 {
+       gboolean is_online;
+
        g_return_val_if_fail (account, FALSE);
        
        printf ("DEBUG: %s: account id=%s\n", __FUNCTION__, tny_account_get_id (account));
@@ -1617,9 +1648,10 @@ modest_platform_check_and_wait_for_account_is_online(TnyAccount *account)
        g_main_loop_unref (data->loop);
        /* g_main_context_unref (context); */
 
+       is_online = data->is_online;
        g_slice_free (CheckAccountIdleData, data);
        
-       return data->is_online; 
+       return is_online;       
 }
 
 
@@ -1628,7 +1660,7 @@ static void
 on_cert_dialog_response (GtkDialog *dialog, gint response_id,  const gchar* cert)
 {
        /* GTK_RESPONSE_HELP means we need to show the certificate */
-       if (response_id == GTK_RESPONSE_HELP) {
+       if (response_id == GTK_RESPONSE_APPLY) {
                GtkWidget *note;
                gchar *msg;
                
@@ -1665,11 +1697,15 @@ modest_platform_run_certificate_confirmation_dialog (const gchar* server_name,
        gchar *question = g_strdup_printf (_("mcen_nc_unknown_certificate"),
                                           server_name);
        
+       /* We use GTK_RESPONSE_APPLY because we want the button in the
+          middle of OK and CANCEL the same as the browser does for
+          example. With GTK_RESPONSE_HELP the view button is aligned
+          to the left while the other two to the right */
        note = hildon_note_new_confirmation_add_buttons  (
                GTK_WINDOW(main_win),
                question,
                _("mcen_bd_dialog_ok"),     GTK_RESPONSE_OK,
-               _("mcen_bd_view"),          GTK_RESPONSE_HELP,   /* abusing this... */
+               _("mcen_bd_view"),          GTK_RESPONSE_APPLY,   /* abusing this... */
                _("mcen_bd_dialog_cancel"), GTK_RESPONSE_CANCEL,
                NULL, NULL);
        
@@ -1678,10 +1714,10 @@ modest_platform_run_certificate_confirmation_dialog (const gchar* server_name,
                          (gpointer) certificate);
        
        modest_window_mgr_set_modal (modest_runtime_get_window_mgr (),
-                                    GTK_WINDOW (note));
+                                    GTK_WINDOW (note), (GtkWindow *) main_win);
        response = gtk_dialog_run(GTK_DIALOG(note));
 
-       on_destroy_dialog (GTK_DIALOG(note));
+       on_destroy_dialog (note);
        g_free (question);
        
        return response == GTK_RESPONSE_OK;
@@ -1711,16 +1747,16 @@ modest_platform_run_alert_dialog (const gchar* prompt,
                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));
+                                            GTK_WINDOW (dialog), (GtkWindow *) main_win);
                
                const int response = gtk_dialog_run (GTK_DIALOG (dialog));
                retval = (response == GTK_RESPONSE_YES) || (response == GTK_RESPONSE_OK);
                
-               on_destroy_dialog (GTK_DIALOG(dialog));         
+               on_destroy_dialog (dialog);             
        } else {
                /* Just show the error text and use the default response: */
                modest_platform_run_information_dialog (GTK_WINDOW (main_win), 
-                                                       prompt);
+                                                       prompt, FALSE);
        }
        return retval;
 }
@@ -1828,7 +1864,10 @@ on_conic_device_went_online (TnyMaemoConicDevice *device, const gchar* iap_id, g
        
 void 
 modest_platform_connect_and_perform (GtkWindow *parent_window, 
-                                    TnyAccount *account, ModestConnectedPerformer callback, gpointer user_data)
+                                    gboolean force,
+                                    TnyAccount *account, 
+                                    ModestConnectedPerformer callback, 
+                                    gpointer user_data)
 {
        gboolean device_online;
        TnyDevice *device;
@@ -1864,7 +1903,8 @@ modest_platform_connect_and_perform (GtkWindow *parent_window,
                        info->callback = callback;
                
                        tny_maemo_conic_device_connect_async (TNY_MAEMO_CONIC_DEVICE (device), NULL,
-                                                             on_conic_device_went_online, info);
+                                                             force, on_conic_device_went_online, 
+                                                             info);
  
                        /* We'll cleanup in on_conic_device_went_online */
                }
@@ -1916,7 +1956,8 @@ modest_platform_connect_and_perform (GtkWindow *parent_window,
                 * and the account */
                
                tny_maemo_conic_device_connect_async (TNY_MAEMO_CONIC_DEVICE (device), NULL,
-                                                     on_conic_device_went_online, info);
+                                                     force, on_conic_device_went_online, 
+                                                     info);
                
        } else {
                
@@ -1931,63 +1972,285 @@ modest_platform_connect_and_perform (GtkWindow *parent_window,
        
        return;
 }
-void 
-modest_platform_connect_and_perform_if_network_account (GtkWindow *parent_window, 
-                                                       TnyAccount *account,
-                                                       ModestConnectedPerformer callback, 
-                                                       gpointer user_data)
+
+void
+modest_platform_connect_if_remote_and_perform (GtkWindow *parent_window, 
+                                              gboolean force,
+                                              TnyFolderStore *folder_store, 
+                                              ModestConnectedPerformer callback, 
+                                              gpointer user_data)
 {
-       if (tny_account_get_account_type (account) == TNY_ACCOUNT_TYPE_STORE) {
+       TnyAccount *account = NULL;
+
+       if (!folder_store ||
+           (TNY_IS_MERGE_FOLDER (folder_store) &&
+            (tny_folder_get_folder_type (TNY_FOLDER(folder_store)) == TNY_FOLDER_TYPE_OUTBOX))) {
+
+               /* We promise to instantly perform the callback, so ... */
+               if (callback) {
+                       GError *error = NULL;
+                       g_set_error (&error, TNY_ERROR_DOMAIN, TNY_SERVICE_ERROR_UNKNOWN,
+                                    "Unable to move or not found folder");
+                       callback (FALSE, error, parent_window, NULL, user_data);
+                       g_error_free (error);
+               }
+               return;
+
+       } 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 (g_object_ref (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) {
+                       /* No need to connect a local account */
+                       if (callback)
                                callback (FALSE, NULL, parent_window, account, user_data);
-                       }
-                       
-                       return;
+
+                       goto clean;
                }
        }
+       modest_platform_connect_and_perform (parent_window, force, account, callback, user_data);
  
-       modest_platform_connect_and_perform (parent_window, account, callback, user_data);
-       return;
+ clean:
+       if (account)
+               g_object_unref (account);
 }
+
+static void
+src_account_connect_performer (gboolean canceled, 
+                              GError *err,
+                              GtkWindow *parent_window, 
+                              TnyAccount *src_account, 
+                              gpointer user_data)
+{
+       DoubleConnectionInfo *info = (DoubleConnectionInfo *) user_data;
+
+       if (canceled || err) {
+               /* If there was any error call the user callback */
+               info->callback (canceled, err, parent_window, src_account, info->data);
+       } else {
+               /* Connect the destination account */
+               modest_platform_connect_if_remote_and_perform (parent_window, TRUE, 
+                                                              TNY_FOLDER_STORE (info->dst_account),
+                                                              info->callback, info->data);
+       }
+
+       /* Free the info object */
+       g_object_unref (info->dst_account);
+       g_slice_free (DoubleConnectionInfo, info);
+}
+
+
+void 
+modest_platform_double_connect_and_perform (GtkWindow *parent_window, 
+                                           gboolean force,
+                                           TnyFolderStore *folder_store,
+                                           DoubleConnectionInfo *connect_info)
+{
+       modest_platform_connect_if_remote_and_perform(parent_window, 
+                                                     force,
+                                                     folder_store, 
+                                                     src_account_connect_performer, 
+                                                     connect_info);
+}
+
+GtkWidget *
+modest_platform_get_account_settings_wizard (void)
+{
+       ModestEasysetupWizardDialog *dialog = modest_easysetup_wizard_dialog_new ();
+
+       return GTK_WIDGET (dialog);
+}
+
+ModestConnectedVia
+modest_platform_get_current_connection (void)
+{
+       TnyDevice *device = NULL;
+       ModestConnectedVia retval = MODEST_CONNECTED_VIA_ANY;
+       
+       device = modest_runtime_get_device ();
+
+       if (!tny_device_is_online (device))
+               return MODEST_CONNECTED_VIA_ANY;
+
+#ifdef MODEST_HAVE_CONIC
+       /* Get iap id */
+       const gchar *iap_id = tny_maemo_conic_device_get_current_iap_id (TNY_MAEMO_CONIC_DEVICE (device));
+       if (iap_id) {
+               ConIcIap *iap = tny_maemo_conic_device_get_iap (
+                       TNY_MAEMO_CONIC_DEVICE (device), iap_id);
+               const gchar *bearer_type = con_ic_iap_get_bearer_type (iap);
+               if (bearer_type) {
+                       if (!strcmp (bearer_type, CON_IC_BEARER_WLAN_INFRA) ||
+                           !strcmp (bearer_type, CON_IC_BEARER_WLAN_ADHOC) ||
+                           !strcmp (bearer_type, "WIMAX")) {
+                               retval = MODEST_CONNECTED_VIA_WLAN_OR_WIMAX;
+                       } else {
+                               retval = MODEST_CONNECTED_VIA_ANY;
+                       }
+               }       
+               g_object_unref (iap);
+       }
+#else
+       retval = MODEST_CONNECTED_VIA_WLAN_OR_WIMAX; /* assume WLAN (fast) internet */  
+#endif /* MODEST_HAVE_CONIC */
+       return retval;
+}
+
+gboolean
+modest_platform_check_memory_low (ModestWindow *win,
+                                 gboolean visuals)
+{
+       gboolean lowmem;
+       
+       /* are we in low memory state? */
+       lowmem = osso_mem_in_lowmem_state () ? TRUE : FALSE;
+       
+       if (win && lowmem && visuals)
+               modest_platform_run_information_dialog (
+                       GTK_WINDOW(win),
+                       _KR("memr_ib_operation_disabled"),
+                       TRUE);
+
+       if (lowmem)
+               g_debug ("%s: low memory reached. disallowing some operations",
+                        __FUNCTION__);
+
+       return lowmem;
+}
+
+void 
+modest_platform_run_folder_details_dialog (GtkWindow *parent_window,
+                                          TnyFolder *folder)
+{
+       GtkWidget *dialog;
+       
+       /* Create dialog */
+       dialog = modest_details_dialog_new_with_folder (parent_window, folder);
+
+       /* Run dialog */
+       modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), 
+                                    GTK_WINDOW (dialog), 
+                                    parent_window);
+       gtk_widget_show_all (dialog);
+
+       g_signal_connect_swapped (dialog, "response", 
+                                 G_CALLBACK (gtk_widget_destroy),
+                                 dialog);
+}
+
 void
-modest_platform_connect_and_perform_if_network_folderstore (GtkWindow *parent_window, TnyFolderStore *folder_store, 
-                                                           ModestConnectedPerformer callback, gpointer user_data)
+modest_platform_run_header_details_dialog (GtkWindow *parent_window,
+                                          TnyHeader *header)
 {
-       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? */
-               
-       }
-       
-       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) {
-                       modest_platform_connect_and_perform_if_network_account (NULL, account, callback, user_data);
-                       g_object_unref (account);
-               }
-       } else if (TNY_IS_ACCOUNT (folder_store)) {
-               /* Use the folder store as an account: */
-               modest_platform_connect_and_perform_if_network_account (NULL, TNY_ACCOUNT (folder_store), callback, user_data);
-       }
-       return;
+       GtkWidget *dialog;
+       
+       /* Create dialog */
+       dialog = modest_details_dialog_new_with_header (parent_window, header);
+
+       /* Run dialog */
+       modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), 
+                                    GTK_WINDOW (dialog),
+                                    parent_window);
+       gtk_widget_show_all (dialog);
+
+       g_signal_connect_swapped (dialog, "response", 
+                                 G_CALLBACK (gtk_widget_destroy),
+                                 dialog);
+}
+
+osso_context_t *
+modest_platform_get_osso_context (void)
+{
+       return modest_maemo_utils_get_osso_context ();
+}
+
+GtkWidget* 
+modest_platform_create_move_to_dialog (GtkWindow *parent_window,
+                                      GtkWidget **folder_view)
+{
+       GtkWidget *dialog, *folder_view_container;
+
+       dialog = gtk_dialog_new_with_buttons (_("mcen_ti_moveto_folders_title"),
+                                             GTK_WINDOW (parent_window),
+                                             GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR |
+                                             GTK_DIALOG_DESTROY_WITH_PARENT,
+                                             _("mcen_bd_dialog_ok"), GTK_RESPONSE_OK,
+                                             _("mcen_bd_new"), MODEST_GTK_RESPONSE_NEW_FOLDER,
+                                             _("mcen_bd_dialog_cancel"), GTK_RESPONSE_CANCEL,
+                                             NULL);
+
+       /* Create folder view */
+       *folder_view = modest_platform_create_folder_view (NULL);
+
+       /* Create pannable and add it to the dialog */
+       folder_view_container = gtk_scrolled_window_new (NULL, NULL);
+       gtk_scrolled_window_set_policy  (GTK_SCROLLED_WINDOW (folder_view_container),
+                                        GTK_POLICY_AUTOMATIC,
+                                        GTK_POLICY_AUTOMATIC);
+       gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), folder_view_container);
+       gtk_container_add (GTK_CONTAINER (folder_view_container), *folder_view);
+
+       gtk_window_set_default_size (GTK_WINDOW (dialog), 300, 300);
+
+       gtk_widget_show (GTK_DIALOG (dialog)->vbox);
+       gtk_widget_show (folder_view_container);
+       gtk_widget_show (*folder_view);
+
+       return dialog;
+}
+
+
+TnyList *
+modest_platform_get_list_to_move (ModestWindow *window)
+{
+       TnyList *list = NULL;
+
+       /* If it's a main window then it could be that we're moving a
+          folder or a set of messages */
+       if (MODEST_IS_MAIN_WINDOW (window)) {
+               ModestHeaderView *header_view = NULL;
+               ModestFolderView *folder_view = NULL;
+
+               folder_view = (ModestFolderView *)
+                       modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (window),
+                                                            MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
+               header_view = (ModestHeaderView *)
+                       modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (window),
+                                                            MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
+
+               /* Get folder or messages to transfer */
+               if (gtk_widget_is_focus (GTK_WIDGET (folder_view))) {
+                       TnyFolderStore *src_folder;
+
+                       src_folder = modest_folder_view_get_selected (folder_view);
+                       if (src_folder) {
+                               list = tny_simple_list_new ();
+                               tny_list_prepend (list, G_OBJECT (src_folder));
+                               g_object_unref (src_folder);
+                       }
+               } else if (gtk_widget_is_focus (GTK_WIDGET(header_view))) {
+                       list = modest_header_view_get_selected_headers(header_view);
+               }
+       } else if (MODEST_IS_MSG_VIEW_WINDOW (window)) {
+               TnyHeader *header = NULL;
+
+               /* We simply return the currently viewed message */
+               header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (window));
+               if (header) {
+                       list = tny_simple_list_new ();
+                       tny_list_prepend (list, G_OBJECT (header));
+                       g_object_unref (header);
+               }
+       } else {
+               g_return_val_if_reached (NULL);
+       }
+
+       return list;
 }