#include <hildon/hildon.h>
#include <modest-accounts-window.h>
#include <modest-folder-window.h>
+#include <modest-mailboxes-window.h>
#endif
#include <tny-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);
}
}
header = tny_msg_get_header (msg);
- /* TODO: fetch mailbox */
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;
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;
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);
ModestWindow *top;
ModestWindowMgr *mgr;
gchar *acc_name;
- gboolean retval = TRUE;
gdk_threads_enter ();
acc_name = (gchar *) user_data;
mgr = modest_runtime_get_window_mgr ();
- /* If Modest is already launched then just ignore this call */
- if (modest_window_mgr_get_current_top (mgr)) {
- retval = FALSE;
- goto end;
- }
-
- top = modest_window_mgr_show_initial_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 *folder_window;
-
- /* TODO: should show the mailboxes window in multi mailboxes account */
+ 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);
+ }
- folder_window = (GtkWidget *) modest_folder_window_new (NULL);
- modest_folder_window_set_account (MODEST_FOLDER_WINDOW (folder_window),
- acc_name);
- if (modest_window_mgr_register_window (mgr, MODEST_WINDOW (folder_window), NULL)) {
- gtk_widget_show (folder_window);
+ if (modest_window_mgr_register_window (mgr, MODEST_WINDOW (new_window), NULL)) {
+ gtk_widget_show (new_window);
} else {
- gtk_widget_destroy (folder_window);
- folder_window = NULL;
+ gtk_widget_destroy (new_window);
+ new_window = NULL;
}
}
#else
}
}
#endif
- gdk_threads_leave ();
- end:
+ gdk_threads_leave ();
g_free (acc_name);
return FALSE;
}
if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_MAIL_TO) == 0) {
if (arguments->len != MODEST_DBUS_MAIL_TO_ARGS_COUNT)
goto param_error;
+ 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)
} 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