TnyIterator *iter;
g_return_if_fail (MODEST_IS_WINDOW(win));
+
+ if (MODEST_IS_MSG_EDIT_WINDOW (win)) {
+ gboolean ret_value;
+ g_signal_emit_by_name (G_OBJECT (win), "delete-event", NULL, &ret_value);
+ return;
+ }
header_list = get_selected_headers (win);
/* TODO: thick grain mail operation involving
a list of objects. Composite pattern ??? */
/* TODO: add confirmation dialog */
- mail_op = modest_mail_operation_new_with_id (MODEST_MAIL_OPERATION_ID_DELETE);
+ mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_DELETE);
modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
mail_op);
{
if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
gtk_widget_destroy (GTK_WIDGET (win));
+ } else if (MODEST_IS_MSG_EDIT_WINDOW (win)) {
+ gboolean ret_value;
+ g_signal_emit_by_name (G_OBJECT (win), "delete-event", NULL, &ret_value);
} else if (MODEST_IS_WINDOW (win)) {
gtk_widget_destroy (GTK_WIDGET (win));
} else {
* because it requires a providers preset file which is not publically available.
*/
#ifdef MODEST_PLATFORM_MAEMO /* Defined in config.h */
- GSList *account_names = modest_account_mgr_account_names (modest_runtime_get_account_mgr());
+ GSList *account_names = modest_account_mgr_account_names (modest_runtime_get_account_mgr(),
+ TRUE /* enabled accounts only */);
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 ();
TnyFolder *folder = NULL;
gchar *account_name = NULL;
gchar *from_str = NULL;
- GError *err = NULL;
+/* GError *err = NULL; */
TnyAccount *account = NULL;
ModestWindowMgr *mgr;
+ gchar *signature = NULL;
account_name = g_strdup(modest_window_get_active_account (win));
if (!account_name)
goto cleanup;
}
- msg = modest_tny_msg_new ("", from_str, "", "", "", "", NULL);
+ if (modest_account_mgr_get_bool (modest_runtime_get_account_mgr (), account_name,
+ MODEST_ACCOUNT_USE_SIGNATURE, FALSE)) {
+ signature = modest_account_mgr_get_string (modest_runtime_get_account_mgr (), account_name,
+ MODEST_ACCOUNT_SIGNATURE, FALSE);
+ } else {
+ signature = g_strdup ("");
+ }
+
+ msg = modest_tny_msg_new ("", from_str, "", "", "", signature, NULL);
if (!msg) {
g_printerr ("modest: failed to create new msg\n");
goto cleanup;
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;
- }
+/* 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 edit window */
msg_win = modest_msg_edit_window_new (msg, account_name);
cleanup:
g_free (account_name);
g_free (from_str);
+ g_free (signature);
if (account)
g_object_unref (G_OBJECT(account));
if (msg)
TnyFolder *folder = NULL;
TnyAccount *account = NULL;
ModestWindowMgr *mgr;
+ gchar *signature = NULL;
msg = TNY_MSG (data);
helper = (GetMsgAsyncHelper *) user_data;
from = modest_account_mgr_get_from_string (modest_runtime_get_account_mgr(),
rf_helper->account_name);
+ if (modest_account_mgr_get_bool (modest_runtime_get_account_mgr(),
+ rf_helper->account_name,
+ MODEST_ACCOUNT_USE_SIGNATURE, FALSE)) {
+ signature = modest_account_mgr_get_string (modest_runtime_get_account_mgr (),
+ rf_helper->account_name,
+ MODEST_ACCOUNT_SIGNATURE, FALSE);
+ }
/* Create reply mail */
switch (rf_helper->action) {
case ACTION_REPLY:
new_msg =
- modest_tny_msg_create_reply_msg (msg, from,
+ modest_tny_msg_create_reply_msg (msg, from, signature,
rf_helper->reply_forward_type,
MODEST_TNY_MSG_REPLY_MODE_SENDER);
break;
case ACTION_REPLY_TO_ALL:
new_msg =
- modest_tny_msg_create_reply_msg (msg, from, rf_helper->reply_forward_type,
+ modest_tny_msg_create_reply_msg (msg, from, signature, rf_helper->reply_forward_type,
MODEST_TNY_MSG_REPLY_MODE_ALL);
edit_type = MODEST_EDIT_TYPE_REPLY;
break;
case ACTION_FORWARD:
new_msg =
- modest_tny_msg_create_forward_msg (msg, from, rf_helper->reply_forward_type);
+ modest_tny_msg_create_forward_msg (msg, from, signature, rf_helper->reply_forward_type);
edit_type = MODEST_EDIT_TYPE_FORWARD;
break;
default:
return;
}
+ g_free (signature);
+
if (!new_msg) {
g_printerr ("modest: failed to create message\n");
goto cleanup;
/* Create the mail operation */
/* TODO: The spec wants us to first do any pending deletions, before receiving. */
- mail_op = modest_mail_operation_new ();
+ mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_INFO);
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));
return TRUE;
}
}
-
-void
-modest_ui_actions_on_send_receive (GtkAction *action, ModestWindow *win)
+
+static void
+do_send_receive_current_or_default (ModestWindow *win)
{
gchar *account_name;
-
g_message ("%s: online? %s", __FUNCTION__,
tny_device_is_online(modest_runtime_get_device()) ? "yes":"no");
}
/* Do not continue if no suitable connection is open: */
- if (!check_for_connection (account_name))
- return;
+ if (check_for_connection (account_name)) {
+ /* As per the UI spec,
+ * for POP accounts, we should receive,
+ * for IMAP we should synchronize everything, including receiving,
+ * for SMTP we should send,
+ * first receiving, then sending:
+ */
+ if (!action_receive(account_name))
+ g_printerr ("modest: failed to receive\n");
+ if (!action_send(account_name))
+ g_printerr ("modest: failed to send\n");
+
+ g_free (account_name);
+ }
+}
- /* As per the UI spec,
- * for POP accounts, we should receive,
- * for IMAP we should synchronize everything, including receiving,
- * for SMTP we should send,
- * first receiving, then sending:
- */
- if (!action_receive(account_name))
- g_printerr ("modest: failed to receive\n");
- if (!action_send(account_name))
- g_printerr ("modest: failed to send\n");
+
+static void
+do_send_receive_auto (ModestWindow *win)
+{
+ g_message ("%s: online? %s", __FUNCTION__,
+ tny_device_is_online(modest_runtime_get_device()) ? "yes":"no");
+
+ /* TODO: Delete the item->data strings as well as the list? */
+ GSList *account_names = modest_account_mgr_account_names (modest_runtime_get_account_mgr(),
+ TRUE /* enabled accounts only */);
+ GSList *iter = account_names;
+ while (iter) {
+ const gchar * account_name = (const char*) iter->data;
+
+ /* Do not continue if no suitable connection is open: */
+ if (account_name && check_for_connection (account_name)) {
+ /* As per the UI spec,
+ * for POP accounts, we should receive,
+ * for IMAP we should synchronize everything, including receiving,
+ * for SMTP we should send,
+ * first receiving, then sending:
+ */
+ if (!action_receive(account_name))
+ g_printerr ("modest: failed to receive for account %s\n", account_name);
+ if (!action_send(account_name))
+ g_printerr ("modest: failed to send for account %s\n", account_name);
+ }
+ }
+
+ g_slist_free (account_names);
+}
+
+void
+do_send_receive (ModestWindow *win)
+{
+ const gboolean auto_update = TRUE; /* TODO: Get gconf setting. */
+ if (auto_update)
+ do_send_receive_current_or_default (win);
+ else
+ do_send_receive_auto (win);
+}
+
+void
+modest_ui_actions_on_send_receive (GtkAction *action, ModestWindow *win)
+{
+ /* Check that at least one account exists: */
+ GSList *account_names = modest_account_mgr_account_names (modest_runtime_get_account_mgr(),
+ TRUE /* enabled accounts only */);
+ gboolean accounts_exist = account_names != NULL;
+ g_slist_free (account_names);
+
+ /* If not, allow the user to create an account before trying to send/receive. */
+ if (!accounts_exist) {
+ modest_ui_actions_on_accounts (NULL, win);
+ }
+
+ do_send_receive (win);
}
+
void
modest_ui_actions_toggle_header_list_view (GtkAction *action, ModestMainWindow *main_window)
{
/* what is saved/restored is depending on the style; thus; we save with
* old style, then update the style, and restore for this new style
*/
- modest_widget_memory_save (conf, G_OBJECT(header_view), "header-view");
+ modest_widget_memory_save (conf, G_OBJECT(header_view), MODEST_CONF_HEADER_VIEW_KEY);
if (modest_header_view_get_style
(MODEST_HEADER_VIEW(header_view)) == MODEST_HEADER_VIEW_STYLE_DETAILS)
MODEST_HEADER_VIEW_STYLE_DETAILS);
modest_widget_memory_restore (conf, G_OBJECT(header_view),
- "header-view");
+ MODEST_CONF_HEADER_VIEW_KEY);
}
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");
+ MODEST_CONF_HEADER_VIEW_KEY);
} else {
- modest_widget_memory_save (conf, G_OBJECT (header_view), "header-view");
+ modest_widget_memory_save (conf, G_OBJECT (header_view), MODEST_CONF_HEADER_VIEW_KEY);
modest_header_view_set_folder (MODEST_HEADER_VIEW(header_view), NULL);
}
} else if (TNY_IS_ACCOUNT (folder_store)) {
}
void
+modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edit_window)
+{
+ TnyTransportAccount *transport_account;
+ ModestMailOperation *mail_operation;
+ MsgData *data;
+ gchar *account_name, *from;
+ ModestAccountMgr *account_mgr;
+
+ g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW(edit_window));
+
+ data = modest_msg_edit_window_get_msg_data (edit_window);
+
+ account_mgr = modest_runtime_get_account_mgr();
+ account_name = g_strdup(modest_window_get_active_account (MODEST_WINDOW(edit_window)));
+ if (!account_name)
+ account_name = modest_account_mgr_get_default_account (account_mgr);
+ if (!account_name) {
+ g_printerr ("modest: no account found\n");
+ modest_msg_edit_window_free_msg_data (edit_window, data);
+ return;
+ }
+ transport_account =
+ TNY_TRANSPORT_ACCOUNT(modest_tny_account_store_get_tny_account_by_account
+ (modest_runtime_get_account_store(),
+ account_name,
+ TNY_ACCOUNT_TYPE_TRANSPORT));
+ 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;
+ }
+ from = modest_account_mgr_get_from_string (account_mgr, account_name);
+
+ /* Create the mail operation */
+ mail_operation = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_INFO);
+ modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_operation);
+
+ modest_mail_operation_save_to_drafts (mail_operation,
+ transport_account,
+ from,
+ data->to,
+ data->cc,
+ data->bcc,
+ data->subject,
+ data->plain_body,
+ data->html_body,
+ data->attachments,
+ data->priority_flags);
+ /* Frees */
+ g_free (from);
+ g_free (account_name);
+ g_object_unref (G_OBJECT (transport_account));
+ g_object_unref (G_OBJECT (mail_operation));
+
+ modest_msg_edit_window_free_msg_data (edit_window, data);
+
+ /* Save settings and close the window */
+ gtk_widget_destroy (GTK_WIDGET (edit_window));
+}
+void
modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
{
TnyTransportAccount *transport_account;
ModestAccountMgr *account_mgr;
g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW(edit_window));
+
+ if (!modest_msg_edit_window_check_names (edit_window))
+ return;
data = modest_msg_edit_window_get_msg_data (edit_window);
from = modest_account_mgr_get_from_string (account_mgr, account_name);
/* Create the mail operation */
- mail_operation = modest_mail_operation_new_with_id (MODEST_MAIL_OPERATION_ID_SEND);
+ mail_operation = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_SEND);
modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_operation);
modest_mail_operation_send_new_mail (mail_operation,
if (result == GTK_RESPONSE_REJECT) {
finished = TRUE;
} else {
- ModestMailOperation *mail_op = modest_mail_operation_new ();
+ ModestMailOperation *mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_INFO);
TnyFolder *new_folder = NULL;
modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
if (folder_name != NULL && strlen (folder_name) > 0) {
ModestMailOperation *mail_op;
- mail_op = modest_mail_operation_new ();
+ mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_INFO);
modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
mail_op);
g_free (message);
if (response == GTK_RESPONSE_OK) {
- ModestMailOperation *mail_op = modest_mail_operation_new_with_id (MODEST_MAIL_OPERATION_ID_DELETE);
+ ModestMailOperation *mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_DELETE);
modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
mail_op);
modest_msg_edit_window_select_contacts (window);
}
+void
+modest_ui_actions_on_check_names (GtkAction *action, ModestMsgEditWindow *window)
+{
+ g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
+ modest_msg_edit_window_check_names (window);
+}
+
static GtkWidget*
create_move_to_dialog (ModestWindow *win,
src_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
if (TNY_IS_FOLDER (src_folder)) {
- mail_op = modest_mail_operation_new_with_id (MODEST_MAIL_OPERATION_ID_RECEIVE);
+ mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_RECEIVE);
modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
mail_op);
/* Transfer messages */
if (response == GTK_RESPONSE_OK) {
- mail_op = modest_mail_operation_new ();
+ mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_RECEIVE);
modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
mail_op);
ModestMailOperation *mail_op;
/* Create mail op */
- mail_op = modest_mail_operation_new_with_id (MODEST_MAIL_OPERATION_ID_RECEIVE);
+ mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_RECEIVE);
modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
mail_op);
projects / modest / blobdiff