#include "modest-account-mgr-helpers.h"
#include "modest-tny-account.h"
#include "modest-ui-actions.h"
+
#include "modest-search.h"
#include "widgets/modest-msg-edit-window.h"
#include "modest-tny-msg.h"
#include <libgnomevfs/gnome-vfs-utils.h>
#include <stdio.h>
#include <string.h>
+#include <glib/gstdio.h>
+#include <libgnomevfs/gnome-vfs-mime.h>
+#include <tny-fs-stream.h>
#include <tny-list.h>
#include <tny-iterator.h>
gchar *bcc;
gchar *subject;
gchar *body;
- GSList *attachments;
+ gchar *attachments;
} ComposeMailIdleData;
static gboolean
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 */
}
+
+
+
static gboolean
on_idle_compose_mail(gpointer user_data)
{
ComposeMailIdleData *idle_data = (ComposeMailIdleData*)user_data;
+ gchar **list = NULL;
+ gint i = 0;
/* Get the TnyTransportAccount so we can instantiate a mail operation: */
ModestAccountMgr *account_mgr = modest_runtime_get_account_mgr();
}
if (!account) {
- g_printerr ("modest: failed to get tny account folder'\n", account_name);
+ g_printerr ("modest: failed to get tny account folder'%s'\n", account_name);
} else {
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 {
-
+
/* Create the message: */
TnyMsg *msg = modest_tny_msg_new (idle_data->to, from,
idle_data->cc, idle_data->bcc, idle_data->subject, idle_data->body,
- idle_data->attachments);
+ NULL); /* NULL because m_t_m_n doesn't use it */
if (!msg) {
g_printerr ("modest: failed to create message\n");
tny_folder_add_msg (folder, msg, NULL); /* TODO: check err */
ModestWindow *win = modest_msg_edit_window_new (msg, account_name);
+
+ 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);
+
gtk_widget_show_all (GTK_WIDGET (win));
g_object_unref (G_OBJECT(folder));
static gint on_compose_mail(GArray * arguments, gpointer data, osso_rpc_t * retval)
{
- gchar **list = NULL;
- gint i = 0;
+
if (arguments->len != MODEST_DEBUS_COMPOSE_MAIL_ARGS_COUNT)
return OSSO_ERROR;
idle_data->body = g_strdup (val.value.s);
val = g_array_index(arguments, osso_rpc_t, MODEST_DEBUS_COMPOSE_MAIL_ARG_ATTACHMENTS);
- gchar *attachments_str = g_strdup (val.value.s);
-
- list = g_strsplit(attachments_str, ",", 0);
- for (i=0; list[i] != NULL; i++) {
- idle_data->attachments = g_slist_append(idle_data->attachments, g_strdup(list[i]));
- }
- g_strfreev(list);
+ idle_data->attachments = g_strdup (val.value.s);
-
- /* printf(" debug: to=%s\n", idle_data->to); */
- g_idle_add(on_idle_compose_mail, (gpointer)idle_data);
+ g_idle_add(on_idle_compose_mail, (gpointer)idle_data);
/* Note that we cannot report failures during sending,
* because that would be asynchronous. */
for (hit_iter = hits; hit_iter; hit_iter = hit_iter->next) {
DBusMessageIter struct_iter;
- TnyFolder *tf;
- TnyHeader *header;
- TnyHeaderFlags flags;
- char *msg_url = "";
- const char *subject = "";
- const char *folder = "";
- const char *sender = "";
- guint64 size = 0;
- gboolean has_attachemnt = FALSE;
- gboolean is_unread = FALSE;
- gint64 ts = 0;
- char *furl;
- const char *uid;
-
- g_debug ("Marshalling hit ...(%s)",
- TNY_IS_HEADER (hit_iter->data) ? "yes" : "no");
-
- header = TNY_HEADER (hit_iter->data);
- tf = tny_header_get_folder (header);
- furl = tny_folder_get_url_string (tf);
-
- uid = tny_header_get_uid (header);
- msg_url = g_strdup_printf ("%s/%s", furl, uid);
-
- subject = tny_header_get_subject (header);
- folder = furl;
- sender = tny_header_get_from (header);
- size = tny_header_get_message_size (header);
-
- flags = tny_header_get_flags (header);
- has_attachemnt = flags & TNY_HEADER_FLAG_ATTACHMENTS;
- is_unread = ! (flags & TNY_HEADER_FLAG_SEEN);
- ts = tny_header_get_date_received (header);
+ ModestSearchHit *hit;
+ char *msg_url;
+ const char *subject;
+ const char *folder;
+ const char *sender;
+ guint64 size;
+ gboolean has_attachment;
+ gboolean is_unread;
+ gint64 ts;
+
+ hit = (ModestSearchHit *) hit_iter->data;
+
+ msg_url = hit->msgid;
+ subject = hit->subject;
+ folder = hit->folder;
+ sender = hit->sender;
+ size = hit->msize;
+ has_attachment = hit->has_attachment;
+ is_unread = hit->is_unread;
+ ts = hit->timestamp;
g_debug ("Adding hit: %s", msg_url);
dbus_message_iter_append_basic (&struct_iter,
DBUS_TYPE_BOOLEAN,
- &has_attachemnt);
+ &has_attachment);
dbus_message_iter_append_basic (&struct_iter,
DBUS_TYPE_BOOLEAN,
dbus_message_iter_close_container (&array_iter,
&struct_iter);
+ g_free (hit->msgid);
+ g_free (hit->subject);
+ g_free (hit->folder);
+ g_free (hit->sender);
- g_free (msg_url);
- g_free (furl);
-
- /* Also unref the header, we don't need it anymore */
- g_object_unref (header);
+ g_slice_free (ModestSearchHit, hit);
}
dbus_message_iter_close_container (&iter, &array_iter);
end_date = (time_t) ed_v;
memset (&search, 0, sizeof (search));
+#ifdef MODEST_HAVE_OGS
search.query = query;
+#endif
search.before = start_date;
search.after = end_date;
search.flags = 0;
#ifdef MODEST_HAVE_OGS
search.flags |= MODEST_SEARCH_USE_OGS;
-#endif
-
g_debug ("Starting search for %s", search.query);
-
+#endif
hits = modest_search_all_accounts (&search);
reply = dbus_message_new_method_return (message);
search_result_to_messsage (reply, hits);
-
+
if (reply == NULL) {
g_warning ("Could not create reply");
}
dbus_message_unref (reply);
}
+ g_list_free (hits);
+
}
projects / modest / blobdiff