#include "widgets/modest-msg-edit-window.h"
#include "modest-tny-msg.h"
#include "modest-platform.h"
+#include "modest-defs.h"
#include <libmodest-dbus-client/libmodest-dbus-client.h>
#include <libgnomevfs/gnome-vfs-utils.h>
#include <stdio.h>
#include <string.h>
#include <glib/gstdio.h>
#ifdef MODEST_HAVE_HILDON0_WIDGETS
+#include <hildon-widgets/hildon-program.h>
#include <libgnomevfs/gnome-vfs-mime-utils.h>
#else
+#include <hildon/hildon-program.h>
#include <libgnomevfs/gnome-vfs-mime.h>
#endif
#include <tny-fs-stream.h>
+#ifdef MODEST_TOOLKIT_HILDON2
+#include <hildon/hildon.h>
+#include <modest-accounts-window.h>
+#include <modest-folder-window.h>
+#include <modest-mailboxes-window.h>
+#endif
+
#include <tny-list.h>
#include <tny-iterator.h>
#include <tny-simple-list.h>
gchar **list = g_strsplit(idle_data->attachments, ",", 0);
gint i = 0;
for (i=0; list[i] != NULL; i++) {
- attachments = g_slist_append(attachments, g_strdup(list[i]));
+ attachments = g_slist_append(attachments, g_uri_unescape_string (list[i], NULL));
}
g_strfreev(list);
}
GtkWidget *animation;
} OpenMsgPerformerInfo;
+#ifndef MODEST_TOOLKIT_HILDON2
static gboolean
on_show_opening_animation (gpointer userdata)
{
OpenMsgPerformerInfo *info = (OpenMsgPerformerInfo *) userdata;
info->animation = modest_platform_animation_banner (NULL, NULL, _("mail_me_opening"));
info->animation_timeout = 0;
-
+
return FALSE;
}
+#endif
static gboolean
on_find_msg_async_destroy (gpointer userdata)
GError *err,
gpointer user_data)
{
- TnyHeader *header;
- gchar *msg_uid;
+ TnyHeader *header = NULL;
+ gchar *msg_uid = NULL;
ModestWindowMgr *win_mgr;
ModestWindow *msg_view = NULL;
gboolean is_draft = FALSE;
}
header = tny_msg_get_header (msg);
- if (header && (tny_header_get_flags (header) & TNY_HEADER_FLAG_DELETED)) {
- g_object_unref (header);
+ if (!header || (tny_header_get_flags (header) & TNY_HEADER_FLAG_DELETED)) {
modest_platform_run_information_dialog (NULL, _("mail_ni_ui_folder_get_msg_folder_error"), TRUE);
g_idle_add (notify_error_in_dbus_callback, NULL);
goto end;
} else {
modest_account_name = NULL;
}
-
+
/* Drafts will be opened in the editor, and others will be opened in the viewer */
if (is_draft) {
gchar *modest_account_name = NULL;
+ gchar *mailbox = NULL;
gchar *from_header;
-
+
/* we cannot edit without a valid account... */
if (!modest_account_mgr_has_accounts(modest_runtime_get_account_mgr (), TRUE)) {
if (!modest_ui_actions_run_account_setup_wizard(NULL)) {
modest_window_mgr_unregister_header (win_mgr,
header);
- goto cleanup;
+ goto end;
}
}
from_header = tny_header_dup_from (header);
- modest_account_name = modest_utils_get_account_name_from_recipient (from_header);
+ modest_account_name = modest_utils_get_account_name_from_recipient (from_header, &mailbox);
g_free (from_header);
if (modest_account_name == NULL) {
ModestAccountMgr *mgr = modest_runtime_get_account_mgr ();
modest_account_name = modest_account_mgr_get_default_account (mgr);
}
- msg_view = modest_msg_edit_window_new (msg, modest_account_name, TRUE);
+ msg_view = modest_msg_edit_window_new (msg, modest_account_name, mailbox, TRUE);
+ if (mailbox)
+ g_free (mailbox);
g_free (modest_account_name);
} else {
TnyHeader *header;
}
header = tny_msg_get_header (msg);
- msg_view = modest_msg_view_window_new_for_search_result (msg, modest_account_name, msg_uid);
+ msg_view = modest_msg_view_window_new_for_search_result (msg, modest_account_name, NULL, msg_uid);
if (! (tny_header_get_flags (header) & TNY_HEADER_FLAG_SEEN)) {
ModestMailOperation *mail_op;
}
if (msg_view != NULL) {
- modest_window_mgr_register_window (win_mgr, msg_view);
- gtk_widget_show_all (GTK_WIDGET (msg_view));
+ if (!modest_window_mgr_register_window (win_mgr, msg_view, NULL)) {
+ gtk_widget_destroy (GTK_WIDGET (msg_view));
+ } else {
+ gtk_widget_show_all (GTK_WIDGET (msg_view));
+ }
}
}
-cleanup:
- g_object_unref (header);
-
end:
+ if (header)
+ g_object_unref (header);
+ if (msg_uid)
+ g_free (msg_uid);
on_find_msg_async_destroy (info);
}
if (!account) {
ModestTnyAccountStore *account_store;
ModestTnyLocalFoldersAccount *local_folders_account;
-
+
account_store = modest_runtime_get_account_store ();
local_folders_account = MODEST_TNY_LOCAL_FOLDERS_ACCOUNT (
modest_tny_account_store_get_local_folders_account (account_store));
on_find_msg_async_destroy (info);
return;
}
-
+
+ if (!(modest_tny_folder_is_local_folder (folder) &&
+ (modest_tny_folder_get_local_or_mmc_folder_type (folder) == TNY_FOLDER_TYPE_DRAFTS))) {
+ ModestWindowMgr *win_mgr;
+ ModestWindow *msg_view;
+
+ win_mgr = modest_runtime_get_window_mgr ();
+ if (modest_window_mgr_find_registered_message_uid (win_mgr, info->uri, &msg_view)) {
+ gtk_window_present (GTK_WINDOW(msg_view));
+ } else {
+ const gchar *modest_account_name;
+ TnyAccount *account;
+
+ account = tny_folder_get_account (folder);
+ if (account) {
+ modest_account_name =
+ modest_tny_account_get_parent_modest_account_name_for_server_account (account);
+ } else {
+ modest_account_name = NULL;
+ }
+
+ msg_view = modest_msg_view_window_new_from_uid (modest_account_name, NULL, info->uri);
+ if (msg_view != NULL) {
+ if (!modest_window_mgr_register_window (win_mgr, msg_view, NULL)) {
+ gtk_widget_destroy (GTK_WIDGET (msg_view));
+ } else {
+ gtk_widget_show_all (GTK_WIDGET (msg_view));
+ }
+ }
+ g_object_unref (account);
+
+ }
+ on_find_msg_async_destroy (info);
+ return;
+ }
+
+#ifndef MODEST_TOOLKIT_HILDON2
info->animation_timeout = g_timeout_add (1000, on_show_opening_animation, info);
+#endif
/* Get message */
tny_folder_find_msg_async (folder, info->uri, find_msg_async_cb, NULL, info);
g_object_unref (folder);
static gboolean
on_idle_open_message_performer (gpointer user_data)
{
- ModestWindow *main_win = NULL;
+ ModestWindow *top_win = NULL;
OpenMsgPerformerInfo *info = (OpenMsgPerformerInfo *) user_data;
- main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr(),
- FALSE); /* don't create */
+ top_win = modest_window_mgr_get_current_top (modest_runtime_get_window_mgr());
/* Lock before the call as we're in an idle handler */
gdk_threads_enter ();
if (info->connect) {
- modest_platform_connect_and_perform (GTK_WINDOW (main_win), TRUE, info->account,
+ modest_platform_connect_and_perform (GTK_WINDOW (top_win), TRUE,
+ info->account,
on_open_message_performer, info);
} else {
- on_open_message_performer (FALSE, NULL, GTK_WINDOW (main_win), info->account, info);
+ on_open_message_performer (FALSE, NULL, GTK_WINDOW (top_win),
+ info->account, info);
}
gdk_threads_leave ();
gpointer user_data)
{
TnyHeader *header;
- ModestWindow *main_win = NULL, *msg_view = NULL;
- ModestHeaderView *header_view;
+ ModestWindow *top_win = NULL, *msg_view = NULL;
header = (TnyHeader *) user_data;
/* Get the main window if exists */
- main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr(),
- FALSE); /* don't create */
- if (!main_win) {
+ top_win = modest_window_mgr_get_current_top (modest_runtime_get_window_mgr());
+ if (!top_win) {
g_object_unref (header);
return;
}
}
g_object_unref (header);
- /* Refilter the header view explicitly */
- header_view = (ModestHeaderView *)
- modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(main_win),
- MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
- if (header_view && MODEST_IS_HEADER_VIEW (header_view))
- modest_header_view_refilter (header_view);
+ /* Refilter the header views explicitely */
+
+ /* TODO: call modest_window_mgr_refilter_header_views */
+ /* this call will go through all the windows, get the header views and refilter them */
}
-static gboolean
-on_idle_delete_message (gpointer user_data)
+static gpointer
+thread_prepare_delete_message (gpointer userdata)
{
TnyList *headers = NULL, *tmp_headers = NULL;
TnyFolder *folder = NULL;
TnyHeader *header = NULL, *msg_header = NULL;
TnyMsg *msg = NULL;
TnyAccount *account = NULL;
- const char *uri = NULL;
+ char *uri;
gchar *uid = NULL;
ModestMailOperation *mail_op = NULL;
- ModestWindow *main_win = NULL;
+ ModestWindow *top_win = NULL;
+
+ uri = (char *) userdata;
- uri = (char *) user_data;
-
msg = find_message_by_url (uri, &account);
if (account)
g_object_unref (account);
if (!msg) {
- g_warning ("%s: Could not find message '%s'", __FUNCTION__, uri);
+ g_debug ("%s: Could not find message '%s'", __FUNCTION__, uri);
g_idle_add (notify_error_in_dbus_callback, NULL);
+ g_free (uri);
return FALSE;
}
-
- main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr(),
- FALSE); /* don't create */
-
+
+ top_win = modest_window_mgr_get_current_top (modest_runtime_get_window_mgr());
+
folder = tny_msg_get_folder (msg);
if (!folder) {
- g_warning ("%s: Could not find folder (uri:'%s')", __FUNCTION__, uri);
+ g_debug ("%s: Could not find folder (uri:'%s')", __FUNCTION__, uri);
g_object_unref (msg);
g_idle_add (notify_error_in_dbus_callback, NULL);
+ g_free (uri);
return FALSE;
}
if (folder)
g_object_unref (folder);
g_idle_add (notify_error_in_dbus_callback, NULL);
+ g_free (uri);
return FALSE;
}
* the code below is or does Gtk+ code */
gdk_threads_enter (); /* CHECKED */
- mail_op = modest_mail_operation_new (main_win ? G_OBJECT(main_win) : NULL);
+ mail_op = modest_mail_operation_new (top_win ? G_OBJECT(top_win) : NULL);
modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
g_signal_connect (G_OBJECT (mail_op),
/* Clean */
if (header)
g_object_unref (header);
+ g_free (uri);
return FALSE;
}
+static gboolean
+on_idle_delete_message (gpointer user_data)
+{
+ const char *uri = NULL;
+
+ uri = (char *) user_data;
+
+ g_thread_create (thread_prepare_delete_message, g_strdup (uri), FALSE, NULL);
+
+ return FALSE;
+
+}
+
on_idle_send_receive(gpointer user_data)
{
gboolean auto_update;
- ModestWindow *main_win = NULL;
+ ModestWindow *top_win = NULL;
- main_win =
- modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (),
- FALSE); /* don't create */
+ top_win = modest_window_mgr_get_current_top (modest_runtime_get_window_mgr ());
gdk_threads_enter (); /* CHECKED */
if (auto_update)
/* Do send receive */
- modest_ui_actions_do_send_receive_all (main_win, FALSE, FALSE, FALSE);
+ modest_ui_actions_do_send_receive_all (top_win, FALSE, FALSE, FALSE);
else
/* Disable auto update */
modest_platform_set_update_interval (0);
return FALSE;
}
+
+
static gint
on_dbus_method_dump_send_queues (DBusConnection *con, DBusMessage *message)
{
return OSSO_OK;
}
-static gint
-on_send_receive(GArray *arguments, gpointer data, osso_rpc_t * retval)
-{
+static void
+on_send_receive_performer(gboolean canceled,
+ GError *err,
+ GtkWindow *parent_window,
+ TnyAccount *account,
+ gpointer user_data)
+{
ModestConnectedVia connect_when;
+ if (err || canceled) {
+ g_idle_add (notify_error_in_dbus_callback, NULL);
+ return;
+ }
+
connect_when = modest_conf_get_int (modest_runtime_get_conf (),
MODEST_CONF_UPDATE_WHEN_CONNECTED_BY, NULL);
-
+
/* Perform a send and receive if the user selected to connect
via any mean or if the current connection method is the
same as the one specified by the user */
/* We need this to allow modest to finish */
g_idle_add (notify_error_in_dbus_callback, NULL);
}
-
+}
+
+
+static gint
+on_send_receive(GArray *arguments, gpointer data, osso_rpc_t * retval)
+{
+ TnyDevice *device = modest_runtime_get_device ();
+
+ if (!tny_device_is_online (device))
+ modest_platform_connect_and_perform (NULL, FALSE, NULL, on_send_receive_performer, NULL);
+ else
+ on_send_receive_performer (FALSE, NULL, NULL, NULL, NULL);
+
return OSSO_OK;
}
-static gint
+static gint
on_open_default_inbox(GArray * arguments, gpointer data, osso_rpc_t * retval)
{
g_idle_add(on_idle_top_application, NULL);
-
+
return OSSO_OK;
}
-static gboolean
+static gboolean
+on_idle_open_account (gpointer user_data)
+{
+ ModestWindow *top;
+ ModestWindowMgr *mgr;
+ gchar *acc_name;
+
+ gdk_threads_enter ();
+
+ acc_name = (gchar *) user_data;
+ mgr = modest_runtime_get_window_mgr ();
+
+ top = modest_window_mgr_get_current_top (mgr);
+ if (!top)
+ top = modest_window_mgr_show_initial_window (mgr);
+
+#ifdef MODEST_TOOLKIT_HILDON2
+ if (MODEST_IS_ACCOUNTS_WINDOW (top)) {
+ GtkWidget *new_window;
+ ModestProtocolType store_protocol;
+ gboolean mailboxes_protocol;
+
+ store_protocol = modest_account_mgr_get_store_protocol (modest_runtime_get_account_mgr (),
+ acc_name);
+ mailboxes_protocol =
+ modest_protocol_registry_protocol_type_has_tag (modest_runtime_get_protocol_registry (),
+ store_protocol,
+ MODEST_PROTOCOL_REGISTRY_MULTI_MAILBOX_PROVIDER_PROTOCOLS);
+
+ if (mailboxes_protocol) {
+ new_window = GTK_WIDGET (modest_mailboxes_window_new (acc_name));
+ } else {
+ new_window = GTK_WIDGET (modest_folder_window_new (NULL));
+ modest_folder_window_set_account (MODEST_FOLDER_WINDOW (new_window),
+ acc_name);
+ }
+
+ if (modest_window_mgr_register_window (mgr, MODEST_WINDOW (new_window), NULL)) {
+ gtk_widget_show (new_window);
+ } else {
+ gtk_widget_destroy (new_window);
+ new_window = NULL;
+ }
+ }
+#else
+ if (MODEST_IS_MAIN_WINDOW (top)) {
+ gchar *server_name;
+ GtkWidget *folder_view;
+
+ folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (top),
+ MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
+ server_name = modest_account_mgr_get_server_account_name (modest_runtime_get_account_mgr (),
+ acc_name, TNY_ACCOUNT_TYPE_STORE);
+ if (server_name) {
+ modest_folder_view_set_account_id_of_visible_server_account (MODEST_FOLDER_VIEW (folder_view),
+ server_name);
+ g_free (server_name);
+ }
+ }
+#endif
+
+ gdk_threads_leave ();
+ g_free (acc_name);
+ return FALSE;
+}
+
+static gint
+on_open_account (GArray *arguments, gpointer data, osso_rpc_t *retval)
+{
+ osso_rpc_t val;
+ gchar *account_id;
+
+ /* Get the arguments: */
+ val = g_array_index(arguments, osso_rpc_t, MODEST_DBUS_OPEN_MESSAGE_ARG_URI);
+ account_id = g_strdup (val.value.s);
+
+ g_idle_add (on_idle_open_account, account_id);
+
+ return OSSO_OK;
+}
+
+#ifdef MODEST_TOOLKIT_HILDON2
+static gboolean
+on_idle_top_application (gpointer user_data)
+{
+ HildonWindowStack *stack;
+ GtkWidget *window;
+
+ /* This is a GDK lock because we are an idle callback and
+ * the code below is or does Gtk+ code */
+
+ gdk_threads_enter (); /* CHECKED */
+
+ stack = hildon_window_stack_get_default ();
+ window = GTK_WIDGET (hildon_window_stack_peek (stack));
+
+ if (window) {
+ gtk_window_present (GTK_WINDOW (window));
+ } else {
+ ModestWindowMgr *mgr;
+
+ mgr = modest_runtime_get_window_mgr ();
+ window = (GtkWidget *) modest_window_mgr_show_initial_window (mgr);
+ if (window) {
+ modest_platform_remove_new_mail_notifications (FALSE);
+ } else {
+ g_printerr ("modest: failed to get main window instance\n");
+ }
+ }
+
+ gdk_threads_leave (); /* CHECKED */
+
+ return FALSE; /* Do not call this callback again. */
+}
+#else
+static gboolean
on_idle_top_application (gpointer user_data)
{
ModestWindow *main_win;
gboolean new_window = FALSE;
-
+
/* This is a GDK lock because we are an idle callback and
* the code below is or does Gtk+ code */
gdk_threads_enter (); /* CHECKED */
-
+
main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (),
FALSE);
}
if (main_win) {
- /* Ideally, we would just use gtk_widget_show(),
- * but this widget is not coded correctly to support that: */
- gtk_widget_show_all (GTK_WIDGET (main_win));
- gtk_window_present (GTK_WINDOW (main_win));
-
/* If we're showing an already existing window then
reselect the INBOX */
if (!new_window) {
}
}
+ if (main_win) {
+ gtk_widget_show_all (GTK_WIDGET (main_win));
+ gtk_window_present (GTK_WINDOW (main_win));
+ }
+
gdk_threads_leave (); /* CHECKED */
-
+
return FALSE; /* Do not call this callback again. */
}
+#endif
static gint
on_top_application(GArray * arguments, gpointer data, osso_rpc_t * retval)
dgettext("ke-recv","memr_ib_operation_disabled"),
TRUE);
gdk_threads_leave ();
-
+
return FALSE;
}
-
+
/* Callback for normal D-BUS messages */
-gint
+gint
modest_dbus_req_handler(const gchar * interface, const gchar * method,
GArray * arguments, gpointer data,
osso_rpc_t * retval)
if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_MAIL_TO) == 0) {
if (arguments->len != MODEST_DBUS_MAIL_TO_ARGS_COUNT)
goto param_error;
- return on_mail_to (arguments, data, retval);
+ modest_runtime_set_allow_shutdown (TRUE);
+ return on_mail_to (arguments, data, retval);
} else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_OPEN_MESSAGE) == 0) {
if (arguments->len != MODEST_DBUS_OPEN_MESSAGE_ARGS_COUNT)
goto param_error;
+ modest_runtime_set_allow_shutdown (TRUE);
return on_open_message (arguments, data, retval);
+ } else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_OPEN_ACCOUNT) == 0) {
+ if (arguments->len != MODEST_DBUS_OPEN_ACCOUNT_ARGS_COUNT)
+ goto param_error;
+ modest_runtime_set_allow_shutdown (TRUE);
+ return on_open_account (arguments, data, retval);
} else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_SEND_RECEIVE) == 0) {
if (arguments->len != 0)
goto param_error;
} else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_COMPOSE_MAIL) == 0) {
if (arguments->len != MODEST_DBUS_COMPOSE_MAIL_ARGS_COUNT)
goto param_error;
+ modest_runtime_set_allow_shutdown (TRUE);
return on_compose_mail (arguments, data, retval);
} else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_DELETE_MESSAGE) == 0) {
if (arguments->len != MODEST_DBUS_DELETE_MESSAGE_ARGS_COUNT)
} else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_OPEN_DEFAULT_INBOX) == 0) {
if (arguments->len != 0)
goto param_error;
+ modest_runtime_set_allow_shutdown (TRUE);
return on_open_default_inbox (arguments, data, retval);
} else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_TOP_APPLICATION) == 0) {
if (arguments->len != 0)
goto param_error;
+ modest_runtime_set_allow_shutdown (TRUE);
return on_top_application (arguments, data, retval);
} else {
/* We need to return INVALID here so
}
if (sd_v > 0) {
- search->flags |= MODEST_SEARCH_BEFORE;
+ search->flags |= MODEST_SEARCH_AFTER;
search->start_date = start_date;
}
if (ed_v > 0) {
- search->flags |= MODEST_SEARCH_AFTER;
+ search->flags |= MODEST_SEARCH_BEFORE;
search->end_date = end_date;
}
tny_folder_store_get_folders (folder_store,
all_folders,
NULL /* query */,
+ FALSE,
NULL /* error */);
TnyIterator *iter = tny_list_create_iterator (all_folders);
projects / modest / blobdiff