* src/widgets/modest-window-mgr.[ch]:
[modest] / src / maemo / modest-platform.c
index e263cfd..8956d24 100644 (file)
 #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 <maemo/easysetup/modest-easysetup-wizard.h>
+#include <hildon/hildon-sound.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 +72,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, 
@@ -233,14 +243,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 +268,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 +303,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 +341,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)
@@ -380,6 +397,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 +423,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 +479,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 +499,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) {
@@ -570,6 +585,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)
@@ -606,7 +638,8 @@ launch_sort_headers_dialog (GtkWindow *parent_window,
        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);
        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;
@@ -615,7 +648,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);
        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;
@@ -625,23 +659,27 @@ 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);
        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);
        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);
        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);
        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;
@@ -677,6 +715,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,
@@ -697,9 +740,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);      
 }
@@ -714,23 +754,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"));
@@ -923,6 +980,32 @@ modest_platform_run_confirmation_dialog (GtkWindow *parent_window,
 
        return response;
 }
+
+gint
+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,
+                                                          button_accept, GTK_RESPONSE_ACCEPT,
+                                                          button_cancel, GTK_RESPONSE_CANCEL,
+                                                          NULL);
+       modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), 
+                                    GTK_WINDOW (dialog));
+
+       response = gtk_dialog_run (GTK_DIALOG (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,
@@ -1138,39 +1221,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)
@@ -1287,8 +1337,51 @@ modest_platform_set_update_interval (guint minutes)
 }
 
 void 
-modest_platform_on_new_headers_received (TnyList *header_list) 
+modest_platform_on_new_headers_received (TnyList *header_list,
+                                        gboolean show_visual)
 {
+       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);
+
+       if (!show_visual) {
+               gboolean screen_on, app_in_foreground;
+               ModestWindow *main_window;
+
+               /* Get the screen status */
+               main_window = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (), FALSE);
+               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
+               }
+               /* We do a return here to avoid indentation with an else */
+               return;
+       }
+
 #ifdef MODEST_HAVE_HILDON_NOTIFY
        HildonNotification *notification;
        TnyIterator *iter;
@@ -1337,11 +1430,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 */
@@ -1349,7 +1440,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
@@ -1383,8 +1474,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;
 
@@ -1487,7 +1592,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),
@@ -1496,12 +1600,40 @@ modest_platform_create_folder_view (TnyFolderStoreQuery *query)
        return widget;
 }
 
+void
+banner_finish (gpointer data, GObject *object)
+{
+       g_message ("BANNER FINISH");
+       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;
+       ModestWindowMgr *mgr;
+
+       mgr = modest_runtime_get_window_mgr ();
+       banner = hildon_banner_show_information (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;
+       banner = hildon_banner_show_information (parent, icon_name, text);
+       hildon_banner_set_timeout(HILDON_BANNER(banner), timeout);
 }
 
 GtkWidget *
@@ -1947,14 +2079,34 @@ 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, 
+                                              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) {
+               /* 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)) {
                        
@@ -1975,37 +2127,20 @@ modest_platform_connect_and_perform_if_network_account (GtkWindow *parent_window
  
        return;
 }
-void
-modest_platform_connect_and_perform_if_network_folderstore (GtkWindow *parent_window, 
-                                                           TnyFolderStore *folder_store, 
-                                                           ModestConnectedPerformer callback, 
-                                                           gpointer user_data)
+
+GtkWidget *
+modest_platform_get_account_settings_dialog (ModestAccountSettings *settings)
 {
-       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;
+       ModestAccountSettingsDialog *dialog = modest_account_settings_dialog_new ();
+
+       modest_account_settings_dialog_set_account (dialog, settings);
+       return GTK_WIDGET (dialog);
+}
+
+GtkWidget *
+modest_platform_get_account_settings_wizard ()
+{
+       ModestEasysetupWizardDialog *dialog = modest_easysetup_wizard_dialog_new ();
+
+       return GTK_WIDGET (dialog);
 }