#include <stdio.h>
#include <string.h>
#include <glib/gstdio.h>
+#ifdef MODEST_HAVE_HILDON0_WIDGETS
+#include <libgnomevfs/gnome-vfs-mime-utils.h>
+#else
#include <libgnomevfs/gnome-vfs-mime.h>
+#endif
#include <tny-fs-stream.h>
#include <tny-list.h>
gchar *attachments;
} ComposeMailIdleData;
-static gboolean
-on_idle_send_mail(gpointer user_data)
-{
- SendMailIdleData *idle_data = (SendMailIdleData*)user_data;
-
- /* Get the TnyTransportAccount so we can instantiate a mail operation: */
- ModestAccountMgr *account_mgr = modest_runtime_get_account_mgr();
- gchar *account_name = modest_account_mgr_get_default_account (account_mgr);
- if (!account_name) {
- g_printerr ("modest: no account found\n");
- }
-
- TnyTransportAccount *transport_account = NULL;
- if (account_mgr) {
- transport_account = TNY_TRANSPORT_ACCOUNT(modest_tny_account_store_get_transport_account_for_open_connection
- (modest_runtime_get_account_store(),
- account_name));
- }
-
- if (!transport_account) {
- g_printerr ("modest: no transport account found for '%s'\n", account_name);
- }
-
- /* Create the mail operation: */
- if (transport_account) {
- /* Use the mail operation: */
- gchar * from = modest_account_mgr_get_from_string (account_mgr,
- account_name);
- if (!from) {
- g_printerr ("modest: no from address for account '%s'\n", account_name);
- } else {
- ModestMailOperation *mail_operation = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_SEND, NULL);
- modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_operation);
-
- modest_mail_operation_send_new_mail (mail_operation,
- transport_account,
- NULL,
- from, /* from */
- idle_data->to, idle_data->cc, idle_data->bcc, idle_data->subject,
- idle_data->body, /* plain_body */
- NULL, /* html_body */
- NULL, /* attachments_list, GSList of TnyMimePart. */
- (TnyHeaderFlags)0);
-
- g_free (from);
- g_object_unref (G_OBJECT (mail_operation));
- }
-
- g_object_unref (G_OBJECT (transport_account));
- }
-
- g_free (account_name);
-
- /* Free the idle data: */
- g_free (idle_data->to);
- g_free (idle_data->cc);
- g_free (idle_data->bcc);
- g_free (idle_data->subject);
- g_free (idle_data->body);
- g_free (idle_data->attachments);
- g_free (idle_data);
-
- return FALSE; /* Do not call this callback again. */
-}
-
-/* TODO: Is this actually used by anything?
- * I guess that everything uses *_compose_mail() instead. murrayc.
- */
-static gint on_send_mail(GArray * arguments, gpointer data, osso_rpc_t * retval)
-{
- if (arguments->len != MODEST_DEBUS_SEND_MAIL_ARGS_COUNT)
- return OSSO_ERROR;
-
- /* Use g_idle to context-switch into the application's thread: */
- SendMailIdleData *idle_data = g_new0(SendMailIdleData, 1); /* Freed in the idle callback. */
-
- /* Get the arguments: */
- osso_rpc_t val = g_array_index(arguments, osso_rpc_t, MODEST_DEBUS_SEND_MAIL_ARG_TO);
- idle_data->to = g_strdup (val.value.s);
-
- val = g_array_index(arguments, osso_rpc_t, MODEST_DEBUS_SEND_MAIL_ARG_CC);
- idle_data->cc = g_strdup (val.value.s);
-
- val = g_array_index(arguments, osso_rpc_t, MODEST_DEBUS_SEND_MAIL_ARG_BCC);
- idle_data->bcc = g_strdup (val.value.s);
-
- val = g_array_index(arguments, osso_rpc_t, MODEST_DEBUS_SEND_MAIL_ARG_SUBJECT);
- idle_data->subject = g_strdup (val.value.s);
-
- val = g_array_index(arguments, osso_rpc_t, MODEST_DEBUS_SEND_MAIL_ARG_BODY);
- idle_data->body = g_strdup (val.value.s);
-
- val = g_array_index(arguments, osso_rpc_t, MODEST_DEBUS_SEND_MAIL_ARG_ATTACHMENTS);
- idle_data->attachments = g_strdup (val.value.s);
-
- /* printf(" debug: to=%s\n", idle_data->to); */
- g_idle_add(on_idle_send_mail, (gpointer)idle_data);
-
- /* Note that we cannot report failures during sending,
- * because that would be asynchronous. */
- return OSSO_OK;
-}
-
/** uri_unescape:
* @uri An escaped URI. URIs should always be escaped.
* @len The length of the @uri string, or -1 if the string is null terminated.
return result_to;
}
-
static gboolean
on_idle_mail_to(gpointer user_data)
{
} else {
tny_folder_add_msg (folder, msg, NULL); /* TODO: check err */
-
+ gdk_threads_enter ();
+
ModestWindow *win = modest_msg_edit_window_new (msg, account_name);
+ modest_window_mgr_register_window (modest_runtime_get_window_mgr (), win);
gtk_widget_show_all (GTK_WIDGET (win));
+
+ gdk_threads_leave ();
g_object_unref (G_OBJECT(folder));
+ g_object_unref (win);
}
g_object_unref (G_OBJECT(msg));
g_free(to);
g_free(uri);
-
+
return FALSE; /* Do not call this callback again. */
}
} else {
tny_folder_add_msg (folder, msg, NULL); /* TODO: check err */
-
+
+ gdk_threads_enter ();
+
ModestWindow *win = modest_msg_edit_window_new (msg, account_name);
+ /* it seems Sketch at least sends a leading ',' -- take that into account,
+ * ie strip that ,*/
+ if (idle_data->attachments && idle_data->attachments[0]==',') {
+ gchar *tmp = g_strdup (idle_data->attachments + 1);
+ g_free(idle_data->attachments);
+ idle_data->attachments = tmp;
+ }
+
list = g_strsplit(idle_data->attachments, ",", 0);
for (i=0; list[i] != NULL; i++) {
modest_msg_edit_window_attach_file_noninteractive(
(ModestMsgEditWindow *)win, list[i]);
}
g_strfreev(list);
-
+
+ modest_window_mgr_register_window (modest_runtime_get_window_mgr (), win);
gtk_widget_show_all (GTK_WIDGET (win));
+
+ gdk_threads_leave ();
g_object_unref (G_OBJECT(folder));
+ g_object_unref (win);
}
g_object_unref (G_OBJECT(msg));
g_free (idle_data);
g_free (account_name);
+
return FALSE; /* Do not call this callback again. */
}
static gint on_compose_mail(GArray * arguments, gpointer data, osso_rpc_t * retval)
{
-
-
if (arguments->len != MODEST_DEBUS_COMPOSE_MAIL_ARGS_COUNT)
return OSSO_ERROR;
account_name = tny_account_get_name (account);
msg_uid = tny_header_get_uid (header);
+ gdk_threads_enter ();
+
msg_view = modest_msg_view_window_new (msg,
account_name,
msg_uid);
- /* TODO: does that leak the msg_view ?! */
+ modest_window_mgr_register_window (modest_runtime_get_window_mgr (), msg_view);
gtk_widget_show_all (GTK_WIDGET (msg_view));
+ gdk_threads_leave ();
+
g_object_unref (header);
g_object_unref (account);
+ g_object_unref (msg_view);
return FALSE; /* Do not call this callback again. */
}
{
ModestWindow *win;
+ gdk_threads_enter ();
+
/* Pick the main window if it exists */
win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ());
/* TODO: check the auto-update parameter in the configuration */
modest_ui_actions_do_send_receive_all (win);
+ gdk_threads_leave ();
+
return FALSE; /* Do not call this callback again. */
}
static gboolean
on_idle_open_default_inbox(gpointer user_data)
{
+ gdk_threads_enter ();
+
ModestWindow *win =
modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ());
/* Get the folder view */
GtkWidget *folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
MODEST_WIDGET_TYPE_FOLDER_VIEW);
- modest_folder_view_select_first_inbox_or_local (
- MODEST_FOLDER_VIEW (folder_view));
+ modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (folder_view));
+
+ gdk_threads_leave ();
return FALSE; /* Do not call this callback again. */
}
g_debug ("debug: %s\n", __FUNCTION__);
g_debug ("debug: %s: method received: %s\n", __FUNCTION__, method);
- if (g_ascii_strcasecmp(method, MODEST_DBUS_METHOD_SEND_MAIL) == 0) {
- return on_send_mail (arguments, data, retval);
- } else if (g_ascii_strcasecmp(method, MODEST_DBUS_METHOD_MAIL_TO) == 0) {
+ if (g_ascii_strcasecmp(method, MODEST_DBUS_METHOD_MAIL_TO) == 0) {
return on_mail_to (arguments, data, retval);
} else if (g_ascii_strcasecmp(method, MODEST_DBUS_METHOD_OPEN_MESSAGE) == 0) {
return on_open_message (arguments, data, retval);
on_dbus_method_search (DBusConnection *con, DBusMessage *message)
{
ModestDBusSearchFlags dbus_flags;
- ModestSearch search;
DBusMessage *reply = NULL;
dbus_bool_t res;
dbus_int64_t sd_v;
dbus_int64_t ed_v;
dbus_int32_t flags_v;
dbus_uint32_t size_v;
- char *folder;
- char *query;
+ const char *folder;
+ const char *query;
time_t start_date;
time_t end_date;
GList *hits;
res = dbus_message_get_args (message,
&error,
DBUS_TYPE_STRING, &query,
- DBUS_TYPE_STRING, &folder,
+ DBUS_TYPE_STRING, &folder, /* e.g. "INBOX/drafts": TODO: Use both an ID and a display name. */
DBUS_TYPE_INT64, &sd_v,
DBUS_TYPE_INT64, &ed_v,
DBUS_TYPE_INT32, &flags_v,
start_date = (time_t) sd_v;
end_date = (time_t) ed_v;
+ ModestSearch search;
memset (&search, 0, sizeof (search));
+
+ /* 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.
+ */
+ search.folder = folder;
+
+ /* Remember the text to search for: */
#ifdef MODEST_HAVE_OGS
search.query = query;
#endif
+
+ /* Other criteria: */
search.before = start_date;
search.after = 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_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);
const gchar *folder_name = (const gchar*)list_iter->data;
if (folder_name) {
- g_debug ("DEBUG: %s: Adding folder: %s", __FUNCTION__, folder_name);
+ /* g_debug ("DEBUG: %s: Adding folder: %s", __FUNCTION__, folder_name); */
DBusMessageIter struct_iter;
dbus_message_iter_open_container (&array_iter,
if (TNY_IS_FOLDER (folder_store)) {
add_single_folder_to_list (TNY_FOLDER (folder_store), list);
}
-
/* Recurse into child folders: */
/* Get the folders list: */
+ /*
TnyFolderStoreQuery *query = tny_folder_store_query_new ();
tny_folder_store_query_add_item (query, NULL,
TNY_FOLDER_STORE_QUERY_OPTION_SUBSCRIBED);
+ */
TnyList *all_folders = tny_simple_list_new ();
tny_folder_store_get_folders (folder_store,
all_folders,
- query,
+ NULL /* query */,
NULL /* error */);
TnyIterator *iter = tny_list_create_iterator (all_folders);
while (!tny_iterator_is_done (iter)) {
+
+ /* Do not recurse, because the osso-global-search UI specification
+ * does not seem to want the sub-folders, though that spec seems to
+ * be generally unsuitable for Modest.
+ */
TnyFolder *folder = TNY_FOLDER (tny_iterator_get_current (iter));
+ add_single_folder_to_list (TNY_FOLDER (folder), list);
+
+ #if 0
if (TNY_IS_FOLDER_STORE (folder))
add_folders_to_list (TNY_FOLDER_STORE (folder), list);
else {
add_single_folder_to_list (TNY_FOLDER (folder), list);
}
+ #endif
tny_iterator_next (iter);
}
projects / modest / blobdiff