2007-06-05 Murray Cumming <murrayc@murrayc.com>modest/trunk] > more ChangeLog2

[modest] / src / modest-ui-actions.c

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index c551d04..aec999d 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -91,6 +91,7 @@ typedef struct _ReplyForwardHelper {
        guint reply_forward_type;
        ReplyForwardAction action;
        gchar *account_name;
+       GtkWidget *parent_window;
 } ReplyForwardHelper;
 
 /*
@@ -737,8 +738,6 @@ reply_forward_cb (ModestMailOperation *mail_op,
        ModestWindow *msg_win;
        ModestEditType edit_type;
        gchar *from;
-       GError *err = NULL;
-       TnyFolder *folder = NULL;
        TnyAccount *account = NULL;
        ModestWindowMgr *mgr;
        gchar *signature = NULL;
@@ -795,33 +794,24 @@ reply_forward_cb (ModestMailOperation *mail_op,
                goto cleanup;
        }
 
-       folder = modest_tny_account_get_special_folder (account, TNY_FOLDER_TYPE_DRAFTS);
-       if (!folder) {
-               g_printerr ("modest: failed to find Drafts folder\n");
-               goto cleanup;
-       }
-       
-       tny_folder_add_msg (folder, msg, &err);
-       if (err) {
-               g_printerr ("modest: error adding msg to Drafts folder: %s",
-                           err->message);
-               g_error_free (err);
-               goto cleanup;
-       }       
-
-       /* Create and register the windows */                   
+       /* Create and register the windows */
        msg_win = modest_msg_edit_window_new (new_msg, rf_helper->account_name);
        mgr = modest_runtime_get_window_mgr ();
        modest_window_mgr_register_window (mgr, msg_win);
 
+       if (rf_helper->parent_window != NULL) {
+               gdouble parent_zoom;
+
+               parent_zoom = modest_window_get_zoom (MODEST_WINDOW (rf_helper->parent_window));
+               modest_window_set_zoom (msg_win, parent_zoom);
+       }
+
        /* Show edit window */
        gtk_widget_show_all (GTK_WIDGET (msg_win));
 
 cleanup:
        if (new_msg)
                g_object_unref (G_OBJECT (new_msg));
-       if (folder)
-               g_object_unref (G_OBJECT (folder));
        if (account)
                g_object_unref (G_OBJECT (account));
        g_object_unref (msg);
@@ -913,6 +903,8 @@ reply_forward (ReplyForwardAction action, ModestWindow *win)
        rf_helper->reply_forward_type = reply_forward_type;
        rf_helper->action = action;
        rf_helper->account_name = g_strdup (modest_window_get_active_account (win));
+       if ((win != NULL) && (MODEST_IS_WINDOW (win)))
+               rf_helper->parent_window = GTK_WIDGET (win);
        if (!rf_helper->account_name)
                rf_helper->account_name =
                        modest_account_mgr_get_default_account (modest_runtime_get_account_mgr());
@@ -1241,9 +1233,6 @@ modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view,
                set_active_account_from_tny_account (TNY_ACCOUNT (folder_store), MODEST_WINDOW (main_window));
                /* Show account details */
                modest_main_window_set_contents_style (main_window, MODEST_MAIN_WINDOW_CONTENTS_STYLE_DETAILS);
-       } else if (modest_tny_folder_store_is_virtual_local_folders  (folder_store )) {
-               //TODO: Set the virtual folder store as the "active account" somehow:
-               modest_main_window_set_contents_style (main_window, MODEST_MAIN_WINDOW_CONTENTS_STYLE_DETAILS);
        } else {
                if (TNY_IS_FOLDER (folder_store) && selected) {
                        
@@ -1382,6 +1371,11 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi
                modest_msg_edit_window_free_msg_data (edit_window, data);
                return;
        }
+
+       if (!strcmp (account_name, MODEST_ACTUAL_LOCAL_FOLDERS_ACCOUNT_ID)) {
+               account_name = g_strdup (data->account_name);
+       }
+
        transport_account =
                TNY_TRANSPORT_ACCOUNT(modest_tny_account_store_get_tny_account_by_account
                                      (modest_runtime_get_account_store(),
@@ -1401,6 +1395,7 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi
 
        modest_mail_operation_save_to_drafts (mail_operation,
                                              transport_account,
+                                             data->draft_msg,
                                              from,
                                              data->to, 
                                              data->cc, 
@@ -1443,6 +1438,11 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
                g_printerr ("modest: no account found\n");
                return;
        }
+       MsgData *data = modest_msg_edit_window_get_msg_data (edit_window);
+
+       if (!strcmp (account_name, MODEST_ACTUAL_LOCAL_FOLDERS_ACCOUNT_ID)) {
+               account_name = g_strdup (data->account_name);
+       }
        
        /* Get the currently-active transport account for this modest account: */
        TnyTransportAccount *transport_account =
@@ -1452,13 +1452,12 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
        if (!transport_account) {
                g_printerr ("modest: no transport account found for '%s'\n", account_name);
                g_free (account_name);
+               modest_msg_edit_window_free_msg_data (edit_window, data);
                return;
        }
        
        gchar *from = modest_account_mgr_get_from_string (account_mgr, account_name);
 
-       MsgData *data = modest_msg_edit_window_get_msg_data (edit_window);
-
        /* mail content checks and dialogs */
        if (data->subject == NULL || data->subject[0] == '\0') {
                GtkResponseType response;
@@ -1492,6 +1491,7 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
 
        modest_mail_operation_send_new_mail (mail_operation,
                                             transport_account,
+                                            data->draft_msg,
                                             from,
                                             data->to, 
                                             data->cc,