gchar *bcc;
gchar *subject;
gchar *body;
- gchar *attachments;
-} SendMailIdleData;
-
-typedef struct
-{
- gchar *to;
- gchar *cc;
- gchar *bcc;
- gchar *subject;
- gchar *body;
gchar *attachments;
} ComposeMailIdleData;
+static gboolean on_idle_compose_mail(gpointer user_data);
+
/** 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.
*/
static gchar* uri_parse_mailto (const gchar* mailto, GSList** list_items_and_values)
{
- const gchar* start_to = NULL;
- /* Remove the mailto: prefix:
- * 7 is the length of "mailto:": */
- if (strncmp (mailto, "mailto:", 7) == 0) {
- start_to = mailto + 7;
- }
-
- if (!start_to)
+ /* The URL must begin with mailto: */
+ if (strncmp (mailto, "mailto:", 7) != 0) {
return NULL;
-
+ }
+ const gchar* start_to = mailto + 7;
+
/* Look for ?, or the end of the string, marking the end of the to address: */
const size_t len_to = strcspn (start_to, "?");
gchar* result_to = uri_unescape (start_to, len_to);
printf("debug: result_to=%s\n", result_to);
-
+
+ if (list_items_and_values == NULL) {
+ return result_to;
+ }
+
/* Get any other items: */
const size_t len_mailto = strlen (start_to);
const gchar* p = start_to + len_to + 1; /* parsed so far. */
const gchar* end = start_to + len_mailto;
- /* GSList *items = NULL; */
- const gchar* start_item_name = p;
- size_t len_item_name = 0;
- const gchar* start_item_value = NULL;
while (p < end) {
-
- /* Looking for the end of a name; */
- if (start_item_name) {
- const size_t len = strcspn (p, "="); /* Returns whole string if none found. */
- if (len) {
- /* This marks the end of a name and the start of the value: */
- len_item_name = len;
-
- /* Skip over the name and mark the start of the value: */
- p += (len + 1); /* Skip over the = */
- start_item_value = p;
- }
+ const gchar *name, *value, *name_start, *name_end, *value_start, *value_end;
+ name_start = p;
+ name_end = strchr (name_start, '='); /* Separator between name and value */
+ if (name_end == NULL) {
+ g_debug ("Malformed URI: %s\n", mailto);
+ return result_to;
}
-
- /* Looking for the end of a value: */
- if (start_item_value) {
- const size_t len = strcspn (p, "?"); /* Returns whole string if none found. */
- /* ? marks the start of a new item: */
- if (len) {
- if (start_item_name && len_item_name) {
- /* Finish the previously-started item: */
- gchar *item_value = uri_unescape (start_item_value, len);
- gchar *item_name = g_strndup (start_item_name, len_item_name);
- /* printf ("debug: item name=%s, value=%s\n", item_name, item_value); */
-
- /* Append the items to the list */
- if(list_items_and_values) {
- *list_items_and_values = g_slist_append (*list_items_and_values, item_name);
- *list_items_and_values = g_slist_append (*list_items_and_values, item_value);
- }
- }
-
- /* Skip over the value and mark the start of a possible new name/value pair: */
- p += (len + 1); /* Skip over the ? */
- start_item_name = p;
- len_item_name = 0;
- start_item_value = NULL;
- }
+ value_start = name_end + 1;
+ value_end = strchr (value_start, '&'); /* Separator between value and next parameter */
+
+ name = g_strndup(name_start, name_end - name_start);
+ if (value_end != NULL) {
+ value = uri_unescape(value_start, value_end - value_start);
+ p = value_end + 1;
+ } else {
+ value = uri_unescape(value_start, -1);
+ p = end;
}
-
+ *list_items_and_values = g_slist_append (*list_items_and_values, (gpointer) name);
+ *list_items_and_values = g_slist_append (*list_items_and_values, (gpointer) value);
}
return result_to;
static gboolean
on_idle_mail_to(gpointer user_data)
{
- /* This is based on the implementation of main.c:start_uil(): */
-
- if (!check_and_offer_account_creation ())
- return FALSE;
-
gchar *uri = (gchar*)user_data;
GSList *list_names_and_values = NULL;
-
- /* 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");
- }
-
- TnyAccount *account = NULL;
- if (account_mgr) {
- account = modest_tny_account_store_get_transport_account_for_open_connection (
- modest_runtime_get_account_store(), account_name);
- }
-
- if (!account) {
- g_printerr ("modest: failed to get tny account folder'\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 {
- const gchar *cc = NULL;
- const gchar *bcc = NULL;
- const gchar *subject = NULL;
- const gchar *body = NULL;
-
- /* Get the relevant items from the list: */
- GSList *list = list_names_and_values;
- while (list) {
- const gchar * name = (const gchar*)list->data;
- GSList *list_value = g_slist_next (list);
- const gchar * value = (const gchar*)list_value->data;
-
- if (strcmp (name, "cc") == 0) {
- cc = value;
- } else if (strcmp (name, "bcc") == 0) {
- bcc = value;
- } else if (strcmp (name, "subject") == 0) {
- subject = value;
- } else if (strcmp (name, "body") == 0) {
- body = value;
- }
-
- /* Go to the next pair: */
- if (list_value) {
- list = g_slist_next (list_value);
- } else
- list = NULL;
- }
-
- /* Create the message: */
- gchar *to = uri_parse_mailto (uri, &list_names_and_values);
- TnyMsg *msg = modest_tny_msg_new (to, from,
- cc, bcc, subject, body,
- NULL /* attachments */);
- g_free(to);
- to = NULL;
-
- if (!msg) {
- g_printerr ("modest: failed to create message\n");
- } else {
- ModestWindow *win;
-
- /* This is a GDK lock because we are an idle callback and
- * the code below is or does Gtk+ code */
- gdk_threads_enter ();
- win = modest_msg_edit_window_new (msg, account_name, FALSE);
- modest_window_mgr_register_window (modest_runtime_get_window_mgr (), win);
- gtk_widget_show_all (GTK_WIDGET (win));
- gdk_threads_leave ();
-
- g_object_unref (win);
- }
-
- g_object_unref (G_OBJECT(msg));
- g_object_unref (G_OBJECT(account));
+
+ const gchar *cc = NULL;
+ const gchar *bcc = NULL;
+ const gchar *subject = NULL;
+ const gchar *body = NULL;
+
+ /* Get the relevant items from the list: */
+ gchar *to = uri_parse_mailto (uri, &list_names_and_values);
+ GSList *list = list_names_and_values;
+ while (list) {
+ GSList *list_value = g_slist_next (list);
+ const gchar * name = (const gchar*)list->data;
+ const gchar * value = (const gchar*)list_value->data;
+
+ if (strcmp (name, "cc") == 0) {
+ cc = value;
+ } else if (strcmp (name, "bcc") == 0) {
+ bcc = value;
+ } else if (strcmp (name, "subject") == 0) {
+ subject = value;
+ } else if (strcmp (name, "body") == 0) {
+ body = value;
}
- }
-
- g_free (account_name);
-
- /* Free the list, as required by the uri_parse_mailto() documentation: */
- if (list_names_and_values)
- g_slist_foreach (list_names_and_values, (GFunc)g_free, NULL);
- g_slist_free (list_names_and_values);
-
+
+ list = g_slist_next (list_value);
+ }
+
+ ComposeMailIdleData *idle_data = g_new0(ComposeMailIdleData, 1); /* Freed in the idle callback. */
+
+ idle_data->to = g_strdup (to);
+ idle_data->cc = g_strdup (cc);
+ idle_data->bcc = g_strdup (bcc);
+ idle_data->subject = g_strdup (subject);
+ idle_data->body = g_strdup (body);
+ idle_data->attachments = NULL;
+
+ /* Free the to: and the list, as required by uri_parse_mailto() */
+ g_free(to);
+ g_slist_foreach (list_names_and_values, (GFunc)g_free, NULL);
+ g_slist_free (list_names_and_values);
+
g_free(uri);
-
+
+ on_idle_compose_mail((gpointer)idle_data);
+
return FALSE; /* Do not call this callback again. */
}
idle_data->attachments = tmp;
}
- list = g_strsplit(idle_data->attachments, ",", 0);
- for (i=0; list[i] != NULL; i++) {
- modest_msg_edit_window_attach_file_one(
+ if (idle_data->attachments != NULL) {
+ list = g_strsplit(idle_data->attachments, ",", 0);
+ for (i=0; list[i] != NULL; i++) {
+ modest_msg_edit_window_attach_file_one(
(ModestMsgEditWindow *)win, list[i]);
+ }
+ g_strfreev(list);
}
- g_strfreev(list);
modest_window_mgr_register_window (modest_runtime_get_window_mgr (), win);
gtk_widget_show_all (GTK_WIDGET (win));
return OSSO_OK;
}
-
static TnyMsg *
find_message_by_url (const char *uri, TnyAccount **ac_out)
{
return NULL;
}
+ if (uri && g_str_has_prefix (uri, "merge://")) {
+ /* we assume we're talking about outbox folder, as this
+ * is the only merge folder we work with in modest */
+ return modest_tny_account_store_find_msg_in_outboxes (astore, uri, ac_out);
+ }
+
printf ("DEBUG: %s: uri=%s\n", __FUNCTION__, uri);
/* TODO: When tinymail is built with the extra DBC assertion checks,
* this will crash for local folders (such as drafts),
if (!already_opened) {
/* g_debug ("creating new window for this msg"); */
- modest_window_mgr_register_header (win_mgr, header);
+ modest_window_mgr_register_header (win_mgr, header, NULL);
const gchar *modest_account_name =
modest_tny_account_get_parent_modest_account_name_for_server_account (account);
TnyHeader *msg_header = NULL;
TnyMsg *msg = NULL;
TnyAccount *account = NULL;
- GError *error = NULL;
const char *uri = NULL;
const char *uid = NULL;
gint res = 0;
return OSSO_ERROR;
}
- error = NULL;
res = OSSO_OK;
/* This is a GDK lock because we are an idle callback and
gdk_threads_enter (); /* CHECKED */
ModestWindow *win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ());
modest_do_message_delete (header, win);
-
- if (error != NULL) {
- res = OSSO_ERROR;
- g_error_free (error);
- }
-
-
-
ModestWindowMgr *win_mgr = modest_runtime_get_window_mgr ();
ModestWindow *msg_view = NULL;
if (modest_window_mgr_find_registered_header (win_mgr, header, &msg_view)) {
DBUS_TYPE_INT32, &flags_v,
DBUS_TYPE_UINT32, &size_v,
DBUS_TYPE_INVALID);
-
+
dbus_flags = (ModestDBusSearchFlags) flags_v;
start_date = (time_t) sd_v;
end_date = (time_t) ed_v;
* Note that we don't copy the strings,
* because this struct will only be used for the lifetime of this function.
*/
- search.folder = folder;
+ if (folder && g_str_has_prefix (folder, "MAND:")) {
+ search.folder = folder + strlen ("MAND:");
+ } else if (folder && g_str_has_prefix (folder, "USER:")) {
+ search.folder = folder + strlen ("USER:");
+ } else if (folder && g_str_has_prefix (folder, "MY:")) {
+ search.folder = folder + strlen ("MY:");
+ } else {
+ search.folder = folder;
+ }
/* Remember the text to search for: */
#ifdef MODEST_HAVE_OGS
return;
if (TNY_IS_MERGE_FOLDER (folder)) {
+ const gchar * folder_name;
/* Ignore these because their IDs ares
* a) not always unique or sensible.
* b) not human-readable, and currently need a human-readable
* We could hack our D-Bus API to understand "outbox" as the merged outboxes,
* but that seems unwise. murrayc.
*/
- return;
+ folder_name = tny_folder_get_name (folder);
+ if (folder_name && !strcmp (folder_name, "Outbox")) {
+ *list = g_list_append(*list, g_strdup ("MAND:outbox"));
+ }
+ return;
}
/* Add this folder to the list: */
* TODO: osso-global search should probably be changed to
* take an ID and a Name.
*/
- const gchar * id = tny_folder_get_id (folder);
- if (id && strlen(id))
- *list = g_list_append(*list, g_strdup (id));
+ const gchar * id = tny_folder_get_id (folder);
+ if (id && strlen(id)) {
+ const gchar *prefix = NULL;
+ TnyFolderType folder_type;
+
+ /* dbus global search api expects a prefix identifying the type of
+ * folder here. Mandatory folders should have MAND: prefix, and
+ * other user created folders should have USER: prefix
+ */
+ folder_type = modest_tny_folder_guess_folder_type (folder);
+ switch (folder_type) {
+ case TNY_FOLDER_TYPE_INBOX:
+ prefix = "MY:";
+ break;
+ case TNY_FOLDER_TYPE_OUTBOX:
+ case TNY_FOLDER_TYPE_DRAFTS:
+ case TNY_FOLDER_TYPE_SENT:
+ case TNY_FOLDER_TYPE_ARCHIVE:
+ prefix = "MAND:";
+ break;
+ default:
+ prefix = "USER:";
+ }
+
+
+ *list = g_list_append(*list, g_strdup_printf ("%s%s", prefix, id));
+ }
/*
else {
g_warning ("DEBUG: %s: folder has no name or ID.\n", __FUNCTION__);
on_dbus_method_get_folders (DBusConnection *con, DBusMessage *message)
{
DBusMessage *reply = NULL;
+ ModestAccountMgr *account_mgr = NULL;
+ gchar *account_name = NULL;
+ GList *folder_names = NULL;
+ TnyAccount *account_local = NULL;
+ TnyAccount *account_mmc = NULL;
/* Get the TnyStoreAccount so we can get the folders: */
- ModestAccountMgr *account_mgr = modest_runtime_get_account_mgr();
- gchar *account_name = modest_account_mgr_get_default_account (account_mgr);
+ account_mgr = modest_runtime_get_account_mgr();
+ account_name = modest_account_mgr_get_default_account (account_mgr);
if (!account_name) {
g_printerr ("modest: no account found\n");
}
- GList *folder_names = NULL;
-
- TnyAccount *account = NULL;
if (account_name) {
+ TnyAccount *account = NULL;
if (account_mgr) {
account = modest_tny_account_store_get_server_account (
modest_runtime_get_account_store(), account_name,
* because they are (currently) used with all accounts:
* TODO: This is not working. It seems to get only the Merged Folder (with an ID of "" (not NULL)).
*/
- TnyAccount *account_local =
+ account_local =
modest_tny_account_store_get_local_folders_account (modest_runtime_get_account_store());
add_folders_to_list (TNY_FOLDER_STORE (account_local), &folder_names);
g_object_unref (account_local);
account_local = NULL;
+ /* Obtain the mmc account */
+ account_mmc =
+ modest_tny_account_store_get_mmc_folders_account (modest_runtime_get_account_store());
+ if (account_mmc) {
+ add_folders_to_list (TNY_FOLDER_STORE (account_mmc), &folder_names);
+ g_object_unref (account_mmc);
+ account_mmc = NULL;
+ }
+
/* specs require us to sort the folder names, although
* this is really not the place to do that...
*/