#include <widgets/modest-account-view-window.h>
#include <widgets/modest-details-dialog.h>
#include <widgets/modest-attachments-view.h>
+#include "widgets/modest-folder-view.h"
#include "widgets/modest-global-settings-dialog.h"
#include "modest-connection-specific-smtp-window.h"
#include "modest-account-mgr-helpers.h"
static gchar* ask_for_folder_name (GtkWindow *parent_window, const gchar *title);
+
+static void _on_send_receive_progress_changed (ModestMailOperation *mail_op,
+ ModestMailOperationState *state,
+ gpointer user_data);
+
+
+
void
modest_ui_actions_on_about (GtkAction *action, ModestWindow *win)
{
* 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(),
- TRUE /* enabled accounts only */);
- gboolean accounts_exist = account_names != NULL;
- g_slist_free (account_names);
+ gboolean accounts_exist = modest_account_mgr_has_accounts(
+ modest_runtime_get_account_mgr(), TRUE);
if (!accounts_exist) {
/* If there are no accounts yet, just show the easy-setup wizard, as per the UI spec: */
/* GError *err = NULL; */
TnyAccount *account = NULL;
ModestWindowMgr *mgr;
- gchar *signature = NULL;
+ gchar *signature = NULL, *blank_and_signature = NULL;
account_name = g_strdup(modest_window_get_active_account (win));
if (!account_name)
goto cleanup;
}
- account = modest_tny_account_store_get_tny_account_by_account (modest_runtime_get_account_store(),
+ account = modest_tny_account_store_get_server_account (modest_runtime_get_account_store(),
account_name,
TNY_ACCOUNT_TYPE_STORE);
if (!account) {
MODEST_ACCOUNT_USE_SIGNATURE, FALSE)) {
signature = modest_account_mgr_get_string (modest_runtime_get_account_mgr (), account_name,
MODEST_ACCOUNT_SIGNATURE, FALSE);
+ blank_and_signature = g_strconcat ("\n", signature, NULL);
+ g_free (signature);
} else {
- signature = g_strdup ("");
+ blank_and_signature = g_strdup ("");
}
- msg = modest_tny_msg_new ("", from_str, "", "", "", signature, NULL);
+ msg = modest_tny_msg_new ("", from_str, "", "", "", blank_and_signature, NULL);
if (!msg) {
g_printerr ("modest: failed to create new msg\n");
goto cleanup;
cleanup:
g_free (account_name);
g_free (from_str);
- g_free (signature);
+ g_free (blank_and_signature);
if (account)
g_object_unref (G_OBJECT(account));
if (msg)
while (!tny_iterator_is_done (iter)) {
ModestWindow *window;
TnyHeader *header;
-
+
header = TNY_HEADER (tny_iterator_get_current (iter));
window = modest_window_mgr_find_window_by_header (mgr, header);
if (window) {
tny_iterator_next (iter);
}
+
/* Open each message */
mail_op = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE,
G_OBJECT (win),
open_msg_cb,
NULL,
NULL);
-
/* Clean */
+ g_object_unref (iter);
g_object_unref(mail_op);
}
goto cleanup;
}
- account = modest_tny_account_store_get_tny_account_by_account (modest_runtime_get_account_store(),
+ account = modest_tny_account_store_get_server_account (modest_runtime_get_account_store(),
rf_helper->account_name,
TNY_ACCOUNT_TYPE_STORE);
if (!account) {
reply_forward_cb must do it */
msg = modest_msg_view_window_get_message (MODEST_MSG_VIEW_WINDOW(win));
header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW(win));
- if (!msg || !header) {
+ if (!msg || !header) {
if (msg)
g_object_unref (msg);
if (header)
acc_name = g_strdup (account_name);
}
+ /* Set send/receive operation in progress */
+ modest_main_window_notify_send_receive_initied (MODEST_MAIN_WINDOW(win));
+
+ mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, G_OBJECT(win));
+ g_signal_connect (G_OBJECT(mail_op), "progress-changed",
+ G_CALLBACK (_on_send_receive_progress_changed),
+ win);
+
/* Send & receive. */
/* TODO: The spec wants us to first do any pending deletions, before receiving. */
/* Receive and then send. The operation is tagged initially as
receive and then a send. The operation changes its type
internally, so the progress objects will receive the proper
progress information */
- mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, G_OBJECT(win));
modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
modest_mail_operation_update_account (mail_op, acc_name);
g_object_unref (G_OBJECT (mail_op));
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);
+ /* Check if accounts exist */
+ gboolean accounts_exist =
+ modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE);
/* If not, allow the user to create an account before trying to send/receive. */
if (!accounts_exist)
ModestMainWindow *main_window)
{
g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
-
+ g_return_if_fail (MODEST_IS_HEADER_VIEW (header_view));
+
/* If no header has been selected then exit */
if (!header)
return;
-
+
/* Update Main window title */
if (GTK_WIDGET_HAS_FOCUS (header_view)) {
const gchar *subject = tny_header_get_subject (header);
- if (subject && strcmp (subject, ""))
+ if (subject && strlen(subject) > 0)
gtk_window_set_title (GTK_WINDOW (main_window), subject);
else
gtk_window_set_title (GTK_WINDOW (main_window), _("mail_va_no_subject"));
{
ModestConf *conf;
GtkWidget *header_view;
-
+ gboolean folder_empty = FALSE;
+
g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
header_view = modest_main_window_get_child_widget(main_window,
if (!TNY_IS_MERGE_FOLDER (folder_store)) { /* TnyMergeFolder can have no get_account() implementation. */
/* Update the active account */
- TnyAccount *account = tny_folder_get_account (TNY_FOLDER (folder_store));
+ TnyAccount *account = modest_tny_folder_get_account (TNY_FOLDER (folder_store));
set_active_account_from_tny_account (account, MODEST_WINDOW (main_window));
g_object_unref (account);
}
+
/* Set folder on header view */
- modest_main_window_set_contents_style (main_window,
- MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS);
modest_header_view_set_folder (MODEST_HEADER_VIEW(header_view),
- TNY_FOLDER (folder_store));
- modest_widget_memory_restore (conf, G_OBJECT(header_view),
- MODEST_CONF_HEADER_VIEW_KEY);
+ TNY_FOLDER (folder_store));
+
+ /* Set main view style */
+ folder_empty = tny_folder_get_all_count (TNY_FOLDER (folder_store)) == 0;
+ if (folder_empty) {
+ modest_main_window_set_contents_style (main_window,
+ MODEST_MAIN_WINDOW_CONTENTS_STYLE_EMPTY);
+ }
+ else {
+ modest_main_window_set_contents_style (main_window,
+ MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS);
+ modest_widget_memory_restore (conf, G_OBJECT(header_view),
+ MODEST_CONF_HEADER_VIEW_KEY);
+ }
} else {
/* Update the active account */
modest_window_set_active_account (MODEST_WINDOW (main_window), NULL);
gtk_window_set_default_size (GTK_WINDOW(dialog), 300, 300);
if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
-// modest_platform_connect_and_wait ();;
+// modest_platform_connect_and_wait ();
}
}
gtk_widget_destroy (dialog);
return;
}
- if (!strcmp (account_name, MODEST_ACTUAL_LOCAL_FOLDERS_ACCOUNT_ID)) {
+ if (!strcmp (account_name, MODEST_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
+ TNY_TRANSPORT_ACCOUNT(modest_tny_account_store_get_server_account
(modest_runtime_get_account_store(),
account_name,
TNY_ACCOUNT_TYPE_TRANSPORT));
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)) {
+ if (!strcmp (account_name, MODEST_LOCAL_FOLDERS_ACCOUNT_ID)) {
account_name = g_strdup (data->account_name);
}
gchar *server_name = modest_server_account_get_hostname (
modest_runtime_get_account_mgr(), server_account_name);
+ if (!server_name) {/* This happened once, though I don't know why. murrayc. */
+ g_warning("%s: Could not get server name for server account '%s'", __FUNCTION__, server_account_name);
+ *cancel = TRUE;
+ return;
+ }
/* This causes a warning because the logical ID has no %s in it,
* though the translation does, but there is not much we can do about that: */
gtk_widget_destroy (dialog);
- printf ("DEBUG: %s: cancel=%d\n", __FUNCTION__, *cancel);
+ /* printf ("DEBUG: %s: cancel=%d\n", __FUNCTION__, *cancel); */
}
void
/* Create folder view */
*tree_view = modest_folder_view_new (NULL);
- gtk_tree_view_set_model (GTK_TREE_VIEW (*tree_view),
- gtk_tree_view_get_model (GTK_TREE_VIEW (folder_view)));
+
+ /* It could happen that we're trying to move a message from a
+ window (msg window for example) after the main window was
+ closed, so we can not just get the model of the folder
+ view */
+ if (MODEST_IS_FOLDER_VIEW (folder_view))
+ gtk_tree_view_set_model (GTK_TREE_VIEW (*tree_view),
+ gtk_tree_view_get_model (GTK_TREE_VIEW (folder_view)));
+ else
+ modest_folder_view_update_model (MODEST_FOLDER_VIEW (*tree_view),
+ TNY_ACCOUNT_STORE (modest_runtime_get_account_store ()));
+
gtk_container_add (GTK_CONTAINER (scroll), *tree_view);
/* Add scroll to dialog */
/* Create and run the dialog */
dialog = create_move_to_dialog (MODEST_WINDOW (win), folder_view, &tree_view);
+ modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (tree_view));
result = gtk_dialog_run (GTK_DIALOG(dialog));
g_object_ref (tree_view);
/* Get the folder view */
main_window = MODEST_MAIN_WINDOW (modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ()));
- folder_view = modest_main_window_get_child_widget (main_window,
- MODEST_WIDGET_TYPE_FOLDER_VIEW);
+ if (main_window)
+ folder_view = modest_main_window_get_child_widget (main_window,
+ MODEST_WIDGET_TYPE_FOLDER_VIEW);
+ else
+ folder_view = NULL;
/* Create and run the dialog */
dialog = create_move_to_dialog (MODEST_WINDOW (win), folder_view, &tree_view);
tranasfer_msgs_from_viewer_cb,
NULL);
g_object_unref (G_OBJECT (mail_op));
- }
+ }
g_object_unref (headers);
g_object_unref (folder_store);
}
modest_platform_show_search_messages (GTK_WINDOW (window));
}
+
+void
+modest_ui_actions_on_open_addressbook (GtkAction *action, ModestWindow *win)
+{
+ g_return_if_fail (MODEST_IS_WINDOW (win));
+ modest_platform_show_addressbook (GTK_WINDOW (win));
+}
+
+
+void
+modest_ui_actions_on_toggle_find_in_page (GtkToggleAction *action,
+ ModestWindow *window)
+{
+ g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
+
+ modest_msg_edit_window_toggle_find_toolbar (MODEST_MSG_EDIT_WINDOW (window), gtk_toggle_action_get_active (action));
+}
+
+static void
+_on_send_receive_progress_changed (ModestMailOperation *mail_op,
+ ModestMailOperationState *state,
+ gpointer user_data)
+{
+ g_return_if_fail (MODEST_IS_MAIN_WINDOW(user_data));
+
+ /* Set send/receive operation finished */
+ if (state->status != MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS)
+ modest_main_window_notify_send_receive_completed (MODEST_MAIN_WINDOW(user_data));
+
+}
projects / modest / blobdiff