* Added new folder dialog
[modest] / src / modest-ui-actions.c
index d1e3baa..cc73773 100644 (file)
@@ -34,6 +34,7 @@
 #include <glib/gi18n.h>
 #include <string.h>
 #include <modest-runtime.h>
+#include <modest-tny-folder.h>
 #include <modest-tny-msg.h>
 #include <modest-tny-account.h>
 #include <modest-address-book.h>
 #include "modest-ui-actions.h"
 
 #include "modest-tny-platform-factory.h"
+#include "modest-platform.h"
 
 #include <widgets/modest-main-window.h>
 #include <widgets/modest-msg-view-window.h>
 #include <widgets/modest-account-view-window.h>
+#include <widgets/modest-details-dialog.h>
 
 #include "modest-account-mgr-helpers.h"
 #include "modest-mail-operation.h"
+#include "modest-text-utils.h"
 
 #ifdef MODEST_HAVE_EASYSETUP
 #include "easysetup/modest-easysetup-wizard.h"
@@ -59,7 +63,6 @@
 #include <tny-msg-view.h>
 #include <tny-device.h>
 
-
 typedef struct _GetMsgAsyncHelper {
        ModestWindow *window;
        TnyIterator *iter;
@@ -85,6 +88,7 @@ static void     read_msg_func          (gpointer data, gpointer user_data);
 static void     get_msg_cb             (TnyFolder *folder, TnyMsg *msg,        GError **err, 
                                        gpointer user_data);
 static void     reply_forward          (ReplyForwardAction action, ModestWindow *win);
+
 static gchar*   ask_for_folder_name    (GtkWindow *parent_window, const gchar *title);
 
 
@@ -182,15 +186,29 @@ modest_ui_actions_on_delete (GtkAction *action, ModestWindow *win)
                /* Free iter */
                g_object_unref (G_OBJECT (iter));
        }
+
+       if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
+               gtk_widget_destroy (GTK_WIDGET(win));
+       } 
 }
 
 
 void
 modest_ui_actions_on_quit (GtkAction *action, ModestWindow *win)
 {
-       /* FIXME: save size of main window */
-/*     save_sizes (main_window); */
-       gtk_widget_destroy (GTK_WIDGET (win));
+       gtk_main_quit ();
+}
+
+void
+modest_ui_actions_on_close_window (GtkAction *action, ModestWindow *win)
+{
+       if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
+               gtk_widget_destroy (GTK_WIDGET (win));
+       } else if (MODEST_IS_WINDOW (win)) {
+               gtk_widget_destroy (GTK_WIDGET (win));
+       } else {
+               g_return_if_reached ();
+       }
 }
 
 void
@@ -209,25 +227,23 @@ modest_ui_actions_on_add_to_contacts (GtkAction *action, ModestWindow *win)
 void
 modest_ui_actions_on_accounts (GtkAction *action, ModestWindow *win)
 {
-       GSList *account_names = modest_account_mgr_account_names (modest_runtime_get_account_mgr());
-                                                    
-       gboolean accounts_exist = account_names != NULL;
-       g_slist_free (account_names);
        
        /* This is currently only implemented for Maemo,
         * because it requires a providers preset file which is not publically available.
         */
 #ifdef MODEST_PLATFORM_MAEMO /* Defined in config.h */
-       /* To test, while modest_account_mgr_account_names() is broken: accounts_exist = TRUE; */
+       GSList *account_names = modest_account_mgr_account_names (modest_runtime_get_account_mgr());
+       gboolean accounts_exist = account_names != NULL;
+       g_slist_free (account_names);
+       
+/* To test, while modest_account_mgr_account_names() is broken: accounts_exist = TRUE; */
        if (!accounts_exist) {
                /* If there are no accounts yet, just show the easy-setup wizard, as per the UI spec: */
                ModestEasysetupWizardDialog *wizard = modest_easysetup_wizard_dialog_new ();
                gtk_window_set_transient_for (GTK_WINDOW (wizard), GTK_WINDOW (win));
                gtk_dialog_run (GTK_DIALOG (wizard));
                gtk_widget_destroy (GTK_WIDGET (wizard));
-       }
-       else
-       {
+       } else  {
                /* Show the list of accounts: */
                GtkDialog *account_win = GTK_DIALOG(modest_account_view_window_new ());
                gtk_window_set_transient_for (GTK_WINDOW (account_win), GTK_WINDOW(win));
@@ -235,29 +251,29 @@ modest_ui_actions_on_accounts (GtkAction *action, ModestWindow *win)
                gtk_widget_destroy (GTK_WIDGET(account_win));
        }
 #else
-   GtkWidget *dialog, *label;
-   
-   /* Create the widgets */
-   
-   dialog = gtk_dialog_new_with_buttons ("Message",
-                                         GTK_WINDOW(win),
-                                         GTK_DIALOG_DESTROY_WITH_PARENT,
-                                         GTK_STOCK_OK,
-                                         GTK_RESPONSE_NONE,
-                                         NULL);
-   label = gtk_label_new ("Hello World!");
-   
-   /* Ensure that the dialog box is destroyed when the user responds. */
-   
-   g_signal_connect_swapped (dialog, "response", 
-                             G_CALLBACK (gtk_widget_destroy),
-                             dialog);
-
-   /* Add the label, and show everything we've added to the dialog. */
-
-   gtk_container_add (GTK_CONTAINER (GTK_DIALOG(dialog)->vbox),
-                      label);
-   gtk_widget_show_all (dialog);
+       GtkWidget *dialog, *label;
+       
+       /* Create the widgets */
+       
+       dialog = gtk_dialog_new_with_buttons ("Message",
+                                             GTK_WINDOW(win),
+                                             GTK_DIALOG_DESTROY_WITH_PARENT,
+                                             GTK_STOCK_OK,
+                                             GTK_RESPONSE_NONE,
+                                             NULL);
+       label = gtk_label_new ("Hello World!");
+       
+       /* Ensure that the dialog box is destroyed when the user responds. */
+       
+       g_signal_connect_swapped (dialog, "response", 
+                                 G_CALLBACK (gtk_widget_destroy),
+                                 dialog);
+       
+       /* Add the label, and show everything we've added to the dialog. */
+       
+       gtk_container_add (GTK_CONTAINER (GTK_DIALOG(dialog)->vbox),
+                          label);
+       gtk_widget_show_all (dialog);
 #endif /* MODEST_PLATFORM_MAEMO */
 }
 
@@ -270,12 +286,16 @@ modest_ui_actions_on_new_msg (GtkAction *action, ModestWindow *win)
        gchar *account_name = NULL;
        gchar *from_str = NULL;
        GError *err = NULL;
-       TnyAccount *account;
+       TnyAccount *account = NULL;
        ModestWindowMgr *mgr;
        
        account_name = g_strdup(modest_window_get_active_account (win));
        if (!account_name)
                account_name = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr());
+       if (!account_name) {
+               g_printerr ("modest: no account found\n");
+               goto cleanup;
+       }
        
        account = modest_tny_account_store_get_tny_account_by_account (modest_runtime_get_account_store(),
                                                                       account_name,
@@ -286,8 +306,12 @@ modest_ui_actions_on_new_msg (GtkAction *action, ModestWindow *win)
        }
 
        from_str = modest_account_mgr_get_from_string (modest_runtime_get_account_mgr(), account_name);
+       if (!from_str) {
+               g_printerr ("modest: failed get from string for '%s'\n", account_name);
+               goto cleanup;
+       }
 
-       msg    = modest_tny_msg_new ("", from_str, "", "", "", "", NULL);
+       msg = modest_tny_msg_new ("", from_str, "", "", "", "", NULL);
        if (!msg) {
                g_printerr ("modest: failed to create new msg\n");
                goto cleanup;
@@ -483,7 +507,7 @@ reply_forward (ReplyForwardAction action, ModestWindow *win)
                folder = tny_header_get_folder (header);
                if (folder) {
                        /* The callback will call it per each header */
-                       tny_folder_get_msg_async (folder, header, get_msg_cb, helper);
+                       tny_folder_get_msg_async (folder, header, get_msg_cb, NULL, helper);
                        g_object_unref (G_OBJECT (folder));
                } else 
                        g_printerr ("modest: no folder for header\n");
@@ -520,51 +544,61 @@ modest_ui_actions_on_reply_all (GtkAction *action, ModestWindow *win)
 
 void 
 modest_ui_actions_on_next (GtkAction *action, 
-                          ModestMainWindow *main_window)
+                          ModestWindow *window)
 {
-       GtkWidget *header_view;
-       g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
+       if (MODEST_IS_MAIN_WINDOW (window)) {
+               GtkWidget *header_view;
 
-       header_view = modest_main_window_get_child_widget (main_window,
-                                                          MODEST_WIDGET_TYPE_HEADER_VIEW);
-       if (!header_view)
-               return;
+               header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(window),
+                                                                  MODEST_WIDGET_TYPE_HEADER_VIEW);
+               if (!header_view)
+                       return;
        
-       modest_header_view_select_next (MODEST_HEADER_VIEW(header_view)); 
+               modest_header_view_select_next (MODEST_HEADER_VIEW(header_view)); 
+       } else if (MODEST_IS_MSG_VIEW_WINDOW (window)) {
+               modest_msg_view_window_select_next_message (MODEST_MSG_VIEW_WINDOW (window));
+       } else {
+               g_return_if_reached ();
+       }
 }
 
 void 
 modest_ui_actions_on_prev (GtkAction *action, 
-                          ModestMainWindow *main_window)
+                          ModestWindow *window)
 {
-       GtkWidget *header_view;
-       g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
+       g_return_if_fail (MODEST_IS_WINDOW(window));
 
-       header_view = modest_main_window_get_child_widget (main_window,
-                                                          MODEST_WIDGET_TYPE_HEADER_VIEW);
-       if (!header_view)
-               return;
-       
-       modest_header_view_select_prev (MODEST_HEADER_VIEW(header_view)); 
+       if (MODEST_IS_MAIN_WINDOW (window)) {
+               GtkWidget *header_view;
+               header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(window),
+                                                                  MODEST_WIDGET_TYPE_HEADER_VIEW);
+               if (!header_view)
+                       return;
+               
+               modest_header_view_select_prev (MODEST_HEADER_VIEW(header_view)); 
+       } else if (MODEST_IS_MSG_VIEW_WINDOW (window)) {
+               modest_msg_view_window_select_previous_message (MODEST_MSG_VIEW_WINDOW (window));
+       } else {
+               g_return_if_reached ();
+       }
+}
+
+void 
+modest_ui_actions_on_sort (GtkAction *action, 
+                          ModestWindow *window)
+{
+       g_return_if_fail (MODEST_IS_WINDOW(window));
+       /* FIXME: unimplemented */
 }
 
 
-void
-modest_ui_actions_on_send_receive (GtkAction *action,  ModestWindow *win)
+static gboolean
+action_send (const gchar* account_name)
 {
-       gchar *account_name;
        TnyAccount *tny_account;
        ModestTnySendQueue *send_queue;
-       ModestMailOperation *mail_op;
-       
-       account_name =
-               g_strdup(modest_window_get_active_account(MODEST_WINDOW(win)));
-       if (!account_name)
-               account_name  = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr());
-       if (!account_name) {
-               g_printerr ("modest: cannot get account\n");
-               return;
-       }
+
+       g_return_val_if_fail (account_name, FALSE);
 
        tny_account = 
                modest_tny_account_store_get_tny_account_by_account (modest_runtime_get_account_store(),
@@ -572,26 +606,39 @@ modest_ui_actions_on_send_receive (GtkAction *action,  ModestWindow *win)
                                                                     TNY_ACCOUNT_TYPE_TRANSPORT);
        if (!tny_account) {
                g_printerr ("modest: cannot get tny transport account for %s\n", account_name);
-               return;
+               return FALSE;
        }
        send_queue = modest_tny_send_queue_new (TNY_CAMEL_TRANSPORT_ACCOUNT(tny_account));
        if (!send_queue) {
                g_object_unref (G_OBJECT(tny_account));
                g_printerr ("modest: cannot get send queue for %s\n", account_name);
-               return;
-       } 
+               return FALSE;
+       }
+       
        //modest_tny_send_queue_flush (send_queue);
 
        g_object_unref (G_OBJECT(send_queue));
        g_object_unref (G_OBJECT(tny_account));
 
+       return TRUE;
+}
+
+
+static gboolean
+action_receive (const gchar* account_name)
+{
+       TnyAccount *tny_account;
+       ModestMailOperation *mail_op;
+
+       g_return_val_if_fail (account_name, FALSE);
+
        tny_account = 
                modest_tny_account_store_get_tny_account_by_account (modest_runtime_get_account_store(),
                                                                     account_name,
                                                                     TNY_ACCOUNT_TYPE_STORE);
        if (!tny_account) {
                g_printerr ("modest: cannot get tny store account for %s\n", account_name);
-               return;
+               return FALSE;
        }
 
        /* Create the mail operation */
@@ -599,15 +646,42 @@ modest_ui_actions_on_send_receive (GtkAction *action,  ModestWindow *win)
        modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
        modest_mail_operation_update_account (mail_op, TNY_STORE_ACCOUNT(tny_account));
 
-       /* Frees */
-       g_object_unref (G_OBJECT (tny_account));
+       g_object_unref (G_OBJECT(tny_account));
        g_object_unref (G_OBJECT (mail_op));
+               
+       return TRUE;
 }
 
 
 
 void
-modest_ui_actions_toggle_view (GtkAction *action, ModestMainWindow *main_window)
+modest_ui_actions_on_send_receive (GtkAction *action,  ModestWindow *win)
+{
+       gchar *account_name;
+
+       
+       g_message ("online? %s", 
+               tny_device_is_online(modest_runtime_get_device()) ? "yes":"no");
+                                                               
+       account_name =
+               g_strdup(modest_window_get_active_account(MODEST_WINDOW(win)));
+       if (!account_name)
+               account_name  = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr());
+       if (!account_name) {
+               g_printerr ("modest: cannot get account\n");
+               return;
+       }
+
+       if (!action_send(account_name))
+               g_printerr ("modest: failed to send\n");
+       if (!action_receive(account_name))
+               g_printerr ("modest: failed to receive\n");
+}
+
+
+
+void
+modest_ui_actions_toggle_header_list_view (GtkAction *action, ModestMainWindow *main_window)
 {
        ModestConf *conf;
        GtkWidget *header_view;
@@ -708,35 +782,43 @@ get_msg_cb (TnyFolder *folder, TnyMsg *msg, GError **err, gpointer user_data)
                TnyHeader *header;
                header = TNY_HEADER (tny_iterator_get_current (helper->iter)); 
                tny_folder_get_msg_async (folder, header,                         
-                                         get_msg_cb, helper);
+                                         get_msg_cb, NULL, helper);
                g_object_unref (G_OBJECT(header));
        }
 }
 
 void 
-modest_ui_actions_on_header_selected (ModestHeaderView *folder_view, 
+modest_ui_actions_on_header_selected (ModestHeaderView *header_view, 
                                      TnyHeader *header,
                                      ModestMainWindow *main_window)
 {
-       GtkWidget *msg_preview;
        TnyFolder *folder;
        GetMsgAsyncHelper *helper;
        TnyList *list;
 
        g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
-       
-       msg_preview = modest_main_window_get_child_widget(main_window,
-                                                         MODEST_WIDGET_TYPE_MSG_PREVIEW);
-       if (!msg_preview)
-               return;
-       
+
        /* when there's no header, clear the msgview */
        if (!header) {
-               modest_msg_view_set_message (MODEST_MSG_VIEW(msg_preview), NULL);
+               GtkWidget *msg_preview;
+
+               /* Clear msg preview if exists */
+               msg_preview = modest_main_window_get_child_widget(main_window,
+                                                                 MODEST_WIDGET_TYPE_MSG_PREVIEW);
+       
+               if (msg_preview)
+                       modest_msg_view_set_message (MODEST_MSG_VIEW(msg_preview), NULL);
                return;
        }
 
-       folder = tny_header_get_folder (TNY_HEADER(header));
+       /* Update Main window title */
+       if (GTK_WIDGET_HAS_FOCUS (header_view)) {
+               const gchar *subject = tny_header_get_subject (header);
+               if (subject && strcmp (subject, ""))
+                       gtk_window_set_title (GTK_WINDOW (main_window), subject);
+               else
+                       gtk_window_set_title (GTK_WINDOW (main_window), _("mail_va_no_subject"));
+       }
 
        /* Create list */
        list = tny_simple_list_new ();
@@ -748,9 +830,11 @@ modest_ui_actions_on_header_selected (ModestHeaderView *folder_view,
        helper->iter = tny_list_create_iterator (list);
        helper->func = read_msg_func;
 
+       folder = tny_header_get_folder (TNY_HEADER(header));
+
        tny_folder_get_msg_async (TNY_FOLDER(folder),
                                  header, get_msg_cb,
-                                 helper);
+                                 NULL, helper);
 
        /* Frees */
        g_object_unref (G_OBJECT (folder));
@@ -762,10 +846,9 @@ void
 modest_ui_actions_on_header_activated (ModestHeaderView *folder_view, TnyHeader *header,
                                       ModestMainWindow *main_window)
 {
-       ModestWindow *win;
+       ModestWindow *win = NULL;
        TnyFolder *folder = NULL;
        TnyMsg    *msg    = NULL;
-       gchar *account    = NULL;
        ModestWindowMgr *mgr;
        
        g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
@@ -776,7 +859,7 @@ modest_ui_actions_on_header_activated (ModestHeaderView *folder_view, TnyHeader
        folder = tny_header_get_folder (header);
        if (!folder) {
                g_printerr ("modest: cannot get folder for header\n");
-               goto cleanup;
+               return;
        }
 
        /* FIXME: make async?; check error  */
@@ -786,36 +869,39 @@ modest_ui_actions_on_header_activated (ModestHeaderView *folder_view, TnyHeader
                goto cleanup;
        }
 
-       account =  g_strdup(modest_window_get_active_account(MODEST_WINDOW(main_window)));
-       if (!account)
-               account = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr());
-
-       /* Create and register message view window */   
-       win = modest_msg_view_window_new (msg, account);
+       /* Look if we already have a message view for that header */    
        mgr = modest_runtime_get_window_mgr ();
-       modest_window_mgr_register_window (mgr, win);
+       win = modest_window_mgr_find_window_by_msguid (mgr, tny_header_get_uid (header));
+
+       /* If not, create a new window */
+       if (!win) {
+               gchar *account;
+
+               account =  g_strdup(modest_window_get_active_account(MODEST_WINDOW(main_window)));
+               if (!account)
+                       account = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr());
 
-       gtk_window_set_transient_for (GTK_WINDOW (win),
-                                     GTK_WINDOW (main_window));
+               win = modest_msg_view_window_new (msg, account);
+               modest_window_mgr_register_window (mgr, win);
+
+               gtk_window_set_transient_for (GTK_WINDOW (win),
+                                             GTK_WINDOW (main_window));
+       }
 
        gtk_widget_show_all (GTK_WIDGET(win));
+
+       g_object_unref (G_OBJECT (msg));
        
 cleanup:
-       g_free (account);
-       
-       if (folder)
-               g_object_unref (G_OBJECT (folder));
-       if (msg)
-               g_object_unref (G_OBJECT (msg));
+       g_object_unref (G_OBJECT (folder));
 }
 
 void 
 modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view,
-                                              TnyFolder *folder, 
+                                              TnyFolderStore *folder_store, 
                                               gboolean selected,
                                               ModestMainWindow *main_window)
 {
-       gchar *txt;
        ModestConf *conf;
        GtkWidget *header_view;
        
@@ -828,32 +914,22 @@ modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view,
        
        conf = modest_runtime_get_conf ();
 
-       if (!selected) { /* the folder was unselected; save it's settings  */
-               modest_widget_memory_save (conf, G_OBJECT (header_view), "header-view");
-               gtk_window_set_title (GTK_WINDOW(main_window), "Modest");
-               modest_header_view_set_folder (MODEST_HEADER_VIEW(header_view), NULL);
-       } else {  /* the folder was selected */
-               if (folder) { /* folder may be NULL */
-                       guint num, unread;
-                       gchar *title;
-
-                       num    = tny_folder_get_all_count    (folder);
-                       unread = tny_folder_get_unread_count (folder);
-                       
-                       title = g_strdup_printf ("Modest: %s",
-                                                tny_folder_get_name (folder));
-                       
-                       gtk_window_set_title (GTK_WINDOW(main_window), title);
-                       g_free (title);
-                       
-                       txt = g_strdup_printf (_("%d %s, %d unread"),
-                                              num, num==1 ? _("item") : _("items"), unread);           
-                       //gtk_label_set_label (GTK_LABEL(folder_info_label), txt);
-                       g_free (txt);
+       if (TNY_IS_FOLDER (folder_store)) {
+
+               modest_main_window_set_contents_style (main_window, MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS);
+
+               if (selected) {
+                       modest_header_view_set_folder (MODEST_HEADER_VIEW(header_view), 
+                                                      TNY_FOLDER (folder_store));
+                       modest_widget_memory_restore (conf, G_OBJECT(header_view),
+                                                     "header-view");
+               } else {
+                       modest_widget_memory_save (conf, G_OBJECT (header_view), "header-view");
+                       modest_header_view_set_folder (MODEST_HEADER_VIEW(header_view), NULL);
                }
-               modest_header_view_set_folder (MODEST_HEADER_VIEW(header_view), folder);
-               modest_widget_memory_restore (conf, G_OBJECT(header_view),
-                                             "header-view");
+       } else if (TNY_IS_ACCOUNT (folder_store)) {
+
+               modest_main_window_set_contents_style (main_window, MODEST_MAIN_WINDOW_CONTENTS_STYLE_DETAILS);
        }
 }
 
@@ -910,7 +986,7 @@ void
 modest_ui_actions_on_msg_link_hover (ModestMsgView *msgview, const gchar* link,
                                     ModestWindow *win)
 {
-       g_message (__FUNCTION__);
+       g_message ("%s %s", __FUNCTION__, link);
 }      
 
 
@@ -918,7 +994,14 @@ void
 modest_ui_actions_on_msg_link_clicked (ModestMsgView *msgview, const gchar* link,
                                        ModestWindow *win)
 {
-       g_message (__FUNCTION__);
+       modest_platform_activate_uri (link);
+}
+
+void
+modest_ui_actions_on_msg_link_contextual (ModestMsgView *msgview, const gchar* link,
+                                         ModestWindow *win)
+{
+       modest_platform_show_uri_popup (link);
 }
 
 void
@@ -988,7 +1071,8 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
                                             data->subject, 
                                             data->plain_body, 
                                             data->html_body,
-                                            data->attachments);
+                                            data->attachments,
+                                            data->priority_flags);
        /* Frees */
        g_free (from);
        g_free (account_name);
@@ -1169,7 +1253,7 @@ ask_for_folder_name (GtkWindow *parent_window,
 void 
 modest_ui_actions_on_new_folder (GtkAction *action, ModestMainWindow *main_window)
 {
-       TnyFolder *parent_folder;
+       TnyFolderStore *parent_folder;
        GtkWidget *folder_view;
        
        g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
@@ -1182,27 +1266,10 @@ modest_ui_actions_on_new_folder (GtkAction *action, ModestMainWindow *main_windo
        parent_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view));
        
        if (parent_folder) {
-               gchar *folder_name;
-
-               folder_name = ask_for_folder_name (GTK_WINDOW (main_window),
-                                                  _("Please enter a name for the new folder"));
-
-               if (folder_name != NULL && strlen (folder_name) > 0) {
-                       TnyFolder *new_folder;
-                       ModestMailOperation *mail_op;
+               /* Run the new folder dialog */
+               while (!modest_platform_run_new_folder_dialog (MODEST_WINDOW (main_window),
+                                                              parent_folder));
 
-                       mail_op = modest_mail_operation_new ();
-                       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), 
-                                                        mail_op);
-
-                       new_folder = modest_mail_operation_create_folder (mail_op,
-                                                                         TNY_FOLDER_STORE (parent_folder),
-                                                                         (const gchar *) folder_name);
-                       if (new_folder) 
-                               g_object_unref (new_folder);
-                       g_object_unref (mail_op);
-                       g_free (folder_name);
-               }
                g_object_unref (parent_folder);
        }
 }
@@ -1211,7 +1278,7 @@ void
 modest_ui_actions_on_rename_folder (GtkAction *action,
                                     ModestMainWindow *main_window)
 {
-       TnyFolder *folder;
+       TnyFolderStore *folder;
        GtkWidget *folder_view;
        
        g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
@@ -1223,7 +1290,7 @@ modest_ui_actions_on_rename_folder (GtkAction *action,
        
        folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view));
        
-       if (folder) {
+       if (folder && TNY_IS_FOLDER (folder)) {
                gchar *folder_name;
                folder_name = ask_for_folder_name (GTK_WINDOW (main_window),
                                                   _("Please enter a new name for the folder"));
@@ -1236,7 +1303,7 @@ modest_ui_actions_on_rename_folder (GtkAction *action,
                                                         mail_op);
 
                        modest_mail_operation_rename_folder (mail_op,
-                                                            folder,
+                                                            TNY_FOLDER (folder),
                                                             (const gchar *) folder_name);
 
                        g_object_unref (mail_op);
@@ -1249,7 +1316,7 @@ modest_ui_actions_on_rename_folder (GtkAction *action,
 static void
 delete_folder (ModestMainWindow *main_window, gboolean move_to_trash) 
 {
-       TnyFolder *folder;
+       TnyFolderStore *folder;
        ModestMailOperation *mail_op;
        GtkWidget *folder_view;
        
@@ -1265,7 +1332,7 @@ delete_folder (ModestMainWindow *main_window, gboolean move_to_trash)
        mail_op = modest_mail_operation_new ();
        modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
                                         mail_op);
-       modest_mail_operation_remove_folder (mail_op, folder, move_to_trash);
+       modest_mail_operation_remove_folder (mail_op, TNY_FOLDER (folder), move_to_trash);
 
        g_object_unref (G_OBJECT (mail_op));
        g_object_unref (G_OBJECT (folder));
@@ -1384,6 +1451,17 @@ modest_ui_actions_on_copy (GtkAction *action,
 }
 
 void
+modest_ui_actions_on_undo (GtkAction *action,
+                          ModestWindow *window)
+{
+       if (MODEST_IS_MSG_EDIT_WINDOW (window)) {
+               modest_msg_edit_window_undo (MODEST_MSG_EDIT_WINDOW (window));
+       } else {
+               g_return_if_reached ();
+       }
+}
+
+void
 modest_ui_actions_on_paste (GtkAction *action,
                            ModestWindow *window)
 {
@@ -1423,3 +1501,286 @@ modest_ui_actions_on_select_all (GtkAction *action,
                gtk_text_buffer_select_range (buffer, &start, &end);
        }
 }
+
+void
+modest_ui_actions_on_change_zoom (GtkRadioAction *action,
+                                 GtkRadioAction *selected,
+                                 ModestWindow *window)
+{
+       gint value;
+
+       value = gtk_radio_action_get_current_value (selected);
+       if (MODEST_IS_WINDOW (window)) {
+               modest_window_set_zoom (MODEST_WINDOW (window), ((gdouble)value)/100);
+       }
+}
+
+void     modest_ui_actions_msg_edit_on_change_priority (GtkRadioAction *action,
+                                                       GtkRadioAction *selected,
+                                                       ModestWindow *window)
+{
+       TnyHeaderFlags flags;
+       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
+
+       flags = gtk_radio_action_get_current_value (selected);
+       modest_msg_edit_window_set_priority_flags (MODEST_MSG_EDIT_WINDOW (window), flags);
+}
+
+void     modest_ui_actions_msg_edit_on_change_file_format (GtkRadioAction *action,
+                                                          GtkRadioAction *selected,
+                                                          ModestWindow *window)
+{
+       gint file_format;
+
+       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
+
+       file_format = gtk_radio_action_get_current_value (selected);
+       modest_msg_edit_window_set_file_format (MODEST_MSG_EDIT_WINDOW (window), file_format);
+}
+
+
+void     
+modest_ui_actions_on_zoom_plus (GtkAction *action,
+                               ModestWindow *window)
+{
+       g_return_if_fail (MODEST_IS_WINDOW (window));
+
+       modest_window_zoom_plus (MODEST_WINDOW (window));
+}
+
+void     
+modest_ui_actions_on_zoom_minus (GtkAction *action,
+                                ModestWindow *window)
+{
+       g_return_if_fail (MODEST_IS_WINDOW (window));
+
+       modest_window_zoom_minus (MODEST_WINDOW (window));
+}
+
+void     
+modest_ui_actions_on_toggle_fullscreen    (GtkToggleAction *toggle,
+                                          ModestWindow *window)
+{
+       ModestWindowMgr *mgr;
+       gboolean fullscreen, active;
+       g_return_if_fail (MODEST_IS_WINDOW (window));
+
+       mgr = modest_runtime_get_window_mgr ();
+
+       active = (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (toggle)))?1:0;
+       fullscreen = modest_window_mgr_get_fullscreen_mode (mgr);
+
+       if (active != fullscreen) {
+               modest_window_mgr_set_fullscreen_mode (mgr, active);
+               gtk_window_present (GTK_WINDOW (window));
+       }
+}
+
+void
+modest_ui_actions_on_change_fullscreen (GtkAction *action,
+                                       ModestWindow *window)
+{
+       ModestWindowMgr *mgr;
+       gboolean fullscreen;
+
+       g_return_if_fail (MODEST_IS_WINDOW (window));
+
+       mgr = modest_runtime_get_window_mgr ();
+       fullscreen = modest_window_mgr_get_fullscreen_mode (mgr);
+       modest_window_mgr_set_fullscreen_mode (mgr, !fullscreen);
+
+       gtk_window_present (GTK_WINDOW (window));
+}
+
+/*
+ * Show the header details in a ModestDetailsDialog widget
+ */
+static void
+show_header_details (TnyHeader *header, 
+                    GtkWindow *window)
+{
+       GtkWidget *dialog;
+       
+       /* Create dialog */
+       dialog = modest_details_dialog_new_with_header (window, header);
+
+       /* Run dialog */
+       gtk_widget_show_all (dialog);
+       gtk_dialog_run (GTK_DIALOG (dialog));
+
+       gtk_widget_destroy (dialog);
+}
+
+/*
+ * Show the folder details in a ModestDetailsDialog widget
+ */
+static void
+show_folder_details (TnyFolder *folder, 
+                    GtkWindow *window)
+{
+       GtkWidget *dialog;
+       
+       /* Create dialog */
+       dialog = modest_details_dialog_new_with_folder (window, folder);
+
+       /* Run dialog */
+       gtk_widget_show_all (dialog);
+       gtk_dialog_run (GTK_DIALOG (dialog));
+
+       gtk_widget_destroy (dialog);
+}
+
+
+void     
+modest_ui_actions_on_details (GtkAction *action, 
+                             ModestWindow *win)
+{
+       TnyList * headers_list;
+       TnyIterator *iter;
+       TnyHeader *header;              
+
+       if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
+               TnyMsg *msg;
+
+               msg = modest_msg_view_window_get_message (MODEST_MSG_VIEW_WINDOW (win));
+               if (!msg) {
+                       return;
+               } else {
+                       headers_list = get_selected_headers (win);
+                       if (!headers_list)
+                               return;
+
+                       iter = tny_list_create_iterator (headers_list);
+
+                       header = TNY_HEADER (tny_iterator_get_current (iter));
+                       show_header_details (header, GTK_WINDOW (win));
+                       g_object_unref (header);
+
+                       g_object_unref (iter);
+               }
+       } else if (MODEST_IS_MAIN_WINDOW (win)) {
+               GtkWidget *folder_view, *header_view;
+
+               /* Check which widget has the focus */
+               folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
+                                                                   MODEST_WIDGET_TYPE_FOLDER_VIEW);
+               if (gtk_widget_is_focus (folder_view)) {
+                       TnyFolder *folder;
+
+                       folder = (TnyFolder *) modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
+
+                       /* Show only when it's a folder */
+                       if (!folder || !TNY_IS_FOLDER (folder))
+                               return;
+
+                       show_folder_details (folder, GTK_WINDOW (win));
+
+               } else {
+                       header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
+                                                                          MODEST_WIDGET_TYPE_HEADER_VIEW);
+                       if (!gtk_widget_is_focus (header_view))
+                               return;
+
+                       headers_list = get_selected_headers (win);
+                       if (!headers_list)
+                               return;
+
+                       iter = tny_list_create_iterator (headers_list);
+                       while (!tny_iterator_is_done (iter)) {
+
+                               header = TNY_HEADER (tny_iterator_get_current (iter));
+                               show_header_details (header, GTK_WINDOW (win));
+                               g_object_unref (header);
+
+                               tny_iterator_next (iter);
+                       }
+                       g_object_unref (iter);
+               }
+       }
+}
+
+void     
+modest_ui_actions_on_toggle_show_cc (GtkToggleAction *toggle,
+                                    ModestMsgEditWindow *window)
+{
+       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
+
+       modest_msg_edit_window_show_cc (window, gtk_toggle_action_get_active (toggle));
+}
+
+void     
+modest_ui_actions_on_toggle_show_bcc (GtkToggleAction *toggle,
+                                     ModestMsgEditWindow *window)
+{
+       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
+
+       modest_msg_edit_window_show_bcc (window, gtk_toggle_action_get_active (toggle));
+}
+
+void
+modest_ui_actions_toggle_folders_view (GtkAction *action, 
+                                      ModestMainWindow *main_window)
+{
+       ModestConf *conf;
+       
+       g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
+
+       conf = modest_runtime_get_conf ();
+       
+       if (modest_main_window_get_style (main_window) == MODEST_MAIN_WINDOW_STYLE_SPLIT)
+               modest_main_window_set_style (main_window, MODEST_MAIN_WINDOW_STYLE_SIMPLE);
+       else
+               modest_main_window_set_style (main_window, MODEST_MAIN_WINDOW_STYLE_SPLIT);
+}
+
+void 
+modest_ui_actions_on_toggle_toolbar (GtkToggleAction *toggle, 
+                                    ModestWindow *window)
+{
+       gboolean active, fullscreen = FALSE;
+       ModestWindowMgr *mgr;
+
+       active = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (toggle));
+
+       /* Check if we want to toggle the toolbar vuew in fullscreen
+          or normal mode */
+       if (!strcmp (gtk_action_get_name (GTK_ACTION (toggle)), 
+                    "ViewShowToolbarFullScreen")) {
+               fullscreen = TRUE;
+       }
+
+       /* Toggle toolbar */
+       mgr = modest_runtime_get_window_mgr ();
+       modest_window_mgr_show_toolbars (mgr, active, fullscreen);
+}
+
+void     
+modest_ui_actions_msg_edit_on_select_font (GtkAction *action,
+                                          ModestMsgEditWindow *window)
+{
+       modest_msg_edit_window_select_font (window);
+}
+
+void
+modest_ui_actions_on_folder_display_name_changed (ModestFolderView *folder_view,
+                                                 const gchar *display_name,
+                                                 GtkWindow *window)
+{
+       /* Do not change the application name if the widget has not
+          the focus. This callback could be called even if the folder
+          view has not the focus, because the handled signal could be
+          emitted when the folder view is redrawn */
+       if (gtk_widget_is_focus (GTK_WIDGET (folder_view))) {
+               if (display_name)
+                       gtk_window_set_title (window, display_name);
+               else
+                       gtk_window_set_title (window, " ");
+       }
+}
+
+void
+modest_ui_actions_on_select_contacts (GtkAction *action, ModestMsgEditWindow *window)
+{
+       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
+       modest_msg_edit_window_select_contacts (window);
+}