}
gdk_threads_enter (); /* CHECKED */
- modest_ui_actions_compose_msg(NULL, to, cc, bcc, subject, body, NULL);
+ modest_ui_actions_compose_msg(NULL, to, cc, bcc, subject, body, NULL, FALSE);
gdk_threads_leave (); /* CHECKED */
cleanup:
g_free(idle_data->attachments);
idle_data->attachments = tmp;
}
+
if (idle_data->attachments != NULL) {
gchar **list = g_strsplit(idle_data->attachments, ",", 0);
gint i = 0;
}
g_strfreev(list);
}
+
+ /* If the message has nothing then mark the buffers as not
+ modified. This happens in Maemo for example when opening a
+ new message from Contacts plugin, it sends "" instead of
+ NULLs */
gdk_threads_enter (); /* CHECKED */
- modest_ui_actions_compose_msg(NULL, idle_data->to, idle_data->cc,
- idle_data->bcc, idle_data->subject,
- idle_data->body, attachments);
+ if (!strncmp (idle_data->to, "", 1) &&
+ !strncmp (idle_data->to, "", 1) &&
+ !strncmp (idle_data->cc, "", 1) &&
+ !strncmp (idle_data->bcc, "", 1) &&
+ !strncmp (idle_data->subject, "", 1) &&
+ !strncmp (idle_data->body, "", 1) &&
+ attachments == NULL) {
+ modest_ui_actions_compose_msg(NULL, NULL, NULL, NULL, NULL, NULL, NULL, FALSE);
+ } else {
+ modest_ui_actions_compose_msg(NULL, idle_data->to, idle_data->cc,
+ idle_data->bcc, idle_data->subject,
+ idle_data->body, attachments, TRUE);
+ }
gdk_threads_leave (); /* CHECKED */
cleanup:
g_slist_foreach(attachments, (GFunc)g_free, NULL);
TnyAccount *account;
gchar *uri;
gboolean connect;
+ guint animation_timeout;
+ GtkWidget *animation;
} OpenMsgPerformerInfo;
+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;
+}
+
+static gboolean
+on_hide_opening_animation (gpointer userdata)
+{
+ OpenMsgPerformerInfo *info = (OpenMsgPerformerInfo *) userdata;
+
+ if (info->animation_timeout>0) {
+ g_source_remove (info->animation_timeout);
+ info->animation_timeout = 0;
+ }
+
+ if (info->animation) {
+ gtk_widget_destroy (info->animation);
+ info->animation = NULL;
+ }
+
+ g_slice_free (OpenMsgPerformerInfo, info);
+ return FALSE;
+}
+
static void
on_open_message_performer (gboolean canceled,
GError *err,
goto frees;
}
- /* Get message */
- folder = tny_store_account_find_folder (TNY_STORE_ACCOUNT (account), uri, NULL);
- msg = tny_folder_find_msg (folder, uri, NULL);
-
+ /* Get folder */
+ 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));
+ folder = modest_tny_local_folders_account_get_merged_outbox (local_folders_account);
+ g_object_unref (local_folders_account);
+ } else {
+ folder = tny_store_account_find_folder (TNY_STORE_ACCOUNT (account), uri, NULL);
+ }
if (modest_tny_folder_is_local_folder (folder) &&
(modest_tny_folder_get_local_or_mmc_folder_type (folder) == TNY_FOLDER_TYPE_DRAFTS)) {
is_draft = TRUE;
}
+ /* Get message */
+ msg = tny_folder_find_msg (folder, uri, NULL);
if (!msg) {
g_idle_add (notify_msg_not_found_in_idle, NULL);
goto frees;
/* g_debug ("creating new window for this msg"); */
modest_window_mgr_register_header (win_mgr, header, NULL);
-
- modest_account_name =
- modest_tny_account_get_parent_modest_account_name_for_server_account (account);
+
+ if (account) {
+ modest_account_name =
+ modest_tny_account_get_parent_modest_account_name_for_server_account (account);
+ } else {
+ modest_account_name = NULL;
+ }
/* Drafts will be opened in the editor, and others will be opened in the viewer */
if (is_draft) {
frees:
g_free (info->uri);
- g_object_unref (info->account);
- g_slice_free (OpenMsgPerformerInfo, info);
+ if (info->account)
+ g_object_unref (info->account);
+ g_idle_add (on_hide_opening_animation, info);
}
static gboolean
gchar *uri;
TnyAccount *account = NULL;
gint osso_retval;
+ gboolean is_merge;
/* Get the arguments: */
val = g_array_index(arguments, osso_rpc_t, MODEST_DBUS_OPEN_MESSAGE_ARG_URI);
uri = g_strdup (val.value.s);
+ is_merge = g_str_has_prefix (uri, "merge:");
+
/* Get the account */
- account = tny_account_store_find_account (TNY_ACCOUNT_STORE (modest_runtime_get_account_store ()),
- uri);
+ if (!is_merge)
+ account = tny_account_store_find_account (TNY_ACCOUNT_STORE (modest_runtime_get_account_store ()),
+ uri);
- if (account) {
+ if (is_merge || account) {
OpenMsgPerformerInfo *info;
TnyFolder *folder = NULL;
info = g_slice_new0 (OpenMsgPerformerInfo);
- info->account = g_object_ref (account);
+ if (account)
+ info->account = g_object_ref (account);
info->uri = uri;
info->connect = TRUE;
+ info->animation_timeout = g_timeout_add (1000, on_show_opening_animation, info);
/* Try to get the message, if it's already downloaded
we don't need to connect */
- folder = tny_store_account_find_folder (TNY_STORE_ACCOUNT (account), uri, NULL);
+ if (account) {
+ folder = tny_store_account_find_folder (TNY_STORE_ACCOUNT (account), uri, NULL);
+ } else {
+ 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));
+ folder = modest_tny_local_folders_account_get_merged_outbox (local_folders_account);
+ g_object_unref (local_folders_account);
+ }
if (folder) {
TnyMsg *msg = tny_folder_find_msg (folder, uri, NULL);
if (msg) {
g_idle_add (notify_error_in_dbus_callback, NULL);
}
- g_object_unref (account);
+ if (account)
+ g_object_unref (account);
return osso_retval;
}
if (auto_update)
/* Do send receive */
- modest_ui_actions_do_send_receive_all (main_win, FALSE);
+ modest_ui_actions_do_send_receive_all (main_win, FALSE, FALSE, FALSE);
else
/* Disable auto update */
modest_platform_set_update_interval (0);
static gint
on_send_receive(GArray *arguments, gpointer data, osso_rpc_t * retval)
{
- /* Use g_idle to context-switch into the application's thread: */
- g_idle_add(on_idle_send_receive, NULL);
+ ModestConnectedVia connect_when;
+
+ 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 */
+ if (connect_when == MODEST_CONNECTED_VIA_ANY ||
+ connect_when == modest_platform_get_current_connection ()) {
+ /* Use g_idle to context-switch into the application's thread: */
+ g_idle_add (on_idle_send_receive, NULL);
+ } else {
+ /* We need this to allow modest to finish */
+ g_idle_add (notify_error_in_dbus_callback, NULL);
+ }
return OSSO_OK;
}
return reply;
}
+typedef struct
+{
+ DBusConnection *con;
+ DBusMessage *message;
+ ModestSearch *search;
+} SearchHelper;
+
+static void
+search_all_cb (GList *hits, gpointer user_data)
+{
+ DBusMessage *reply;
+ SearchHelper *helper = (SearchHelper *) user_data;
+
+ reply = dbus_message_new_method_return (helper->message);
+
+ if (reply) {
+ dbus_uint32_t serial = 0;
+
+ search_result_to_message (reply, hits);
+
+ dbus_connection_send (helper->con, reply, &serial);
+ dbus_connection_flush (helper->con);
+ dbus_message_unref (reply);
+ }
+
+ /* Free the helper */
+ dbus_message_unref (helper->message);
+ modest_search_free (helper->search);
+ g_slice_free (ModestSearch, helper->search);
+ g_slice_free (SearchHelper, helper);
+}
static void
on_dbus_method_search (DBusConnection *con, DBusMessage *message)
{
ModestDBusSearchFlags dbus_flags;
- DBusMessage *reply = NULL;
dbus_bool_t res;
dbus_int64_t sd_v;
dbus_int64_t ed_v;
const char *query;
time_t start_date;
time_t end_date;
- GList *hits;
-
+ ModestSearch *search;
DBusError error;
+
dbus_error_init (&error);
sd_v = ed_v = 0;
start_date = (time_t) sd_v;
end_date = (time_t) ed_v;
- ModestSearch search;
- memset (&search, 0, sizeof (search));
+ search = g_slice_new0 (ModestSearch);
- /* Remember what folder we are searching in:
- *
- * Note that we don't copy the strings,
- * because this struct will only be used for the lifetime of this function.
- */
if (folder && g_str_has_prefix (folder, "MAND:")) {
- search.folder = folder + strlen ("MAND:");
+ search->folder = g_strdup (folder + strlen ("MAND:"));
} else if (folder && g_str_has_prefix (folder, "USER:")) {
- search.folder = folder + strlen ("USER:");
+ search->folder = g_strdup (folder + strlen ("USER:"));
} else if (folder && g_str_has_prefix (folder, "MY:")) {
- search.folder = folder + strlen ("MY:");
+ search->folder = g_strdup (folder + strlen ("MY:"));
} else {
- search.folder = folder;
+ search->folder = g_strdup (folder);
}
/* Remember the text to search for: */
#ifdef MODEST_HAVE_OGS
- search.query = query;
+ search->query = g_strdup (query);
#endif
/* Other criteria: */
- search.start_date = start_date;
- search.end_date = end_date;
- search.flags = 0;
+ search->start_date = start_date;
+ search->end_date = end_date;
+ search->flags = 0;
/* Text to serach for in various parts of the message: */
if (dbus_flags & MODEST_DBUS_SEARCH_SUBJECT) {
- search.flags |= MODEST_SEARCH_SUBJECT;
- search.subject = query;
+ search->flags |= MODEST_SEARCH_SUBJECT;
+ search->subject = g_strdup (query);
}
if (dbus_flags & MODEST_DBUS_SEARCH_SENDER) {
- search.flags |= MODEST_SEARCH_SENDER;
- search.from = query;
+ search->flags |= MODEST_SEARCH_SENDER;
+ search->from = g_strdup (query);
}
if (dbus_flags & MODEST_DBUS_SEARCH_RECIPIENT) {
- search.flags |= MODEST_SEARCH_RECIPIENT;
- search.recipient = query;
+ search->flags |= MODEST_SEARCH_RECIPIENT;
+ search->recipient = g_strdup (query);
}
if (dbus_flags & MODEST_DBUS_SEARCH_BODY) {
- search.flags |= MODEST_SEARCH_BODY;
- search.body = query;
+ search->flags |= MODEST_SEARCH_BODY;
+ search->body = g_strdup (query);
}
if (sd_v > 0) {
- search.flags |= MODEST_SEARCH_BEFORE;
- search.start_date = start_date;
+ search->flags |= MODEST_SEARCH_BEFORE;
+ search->start_date = start_date;
}
if (ed_v > 0) {
- search.flags |= MODEST_SEARCH_AFTER;
- search.end_date = end_date;
+ search->flags |= MODEST_SEARCH_AFTER;
+ search->end_date = end_date;
}
if (size_v > 0) {
- search.flags |= MODEST_SEARCH_SIZE;
- search.minsize = size_v;
+ search->flags |= MODEST_SEARCH_SIZE;
+ search->minsize = size_v;
}
#ifdef MODEST_HAVE_OGS
- search.flags |= MODEST_SEARCH_USE_OGS;
- g_debug ("%s: Starting search for %s", __FUNCTION__, search.query);
+ search->flags |= MODEST_SEARCH_USE_OGS;
+ g_debug ("%s: Starting search for %s", __FUNCTION__, search->query);
#endif
- /* Note that this currently gets folders and messages from the servers,
- * which can take a long time. libmodest_dbus_client_search() can timeout,
- * reporting no results, if this takes a long time: */
- hits = modest_search_all_accounts (&search);
-
- reply = dbus_message_new_method_return (message);
-
- search_result_to_message (reply, hits);
-
- if (reply == NULL) {
- g_warning ("%s: Could not create reply.", __FUNCTION__);
- }
-
- if (reply) {
- dbus_uint32_t serial = 0;
- dbus_connection_send (con, reply, &serial);
- dbus_connection_flush (con);
- dbus_message_unref (reply);
- }
+ SearchHelper *helper = g_slice_new (SearchHelper);
+ helper->search = search;
+ dbus_message_ref (message);
+ helper->message = message;
+ helper->con = con;
- g_list_free (hits);
+ /* Search asynchronously */
+ modest_search_all_accounts (search, search_all_cb, helper);
}
projects / modest / blobdiff