#include <tny-list.h>
#include <tny-iterator.h>
#include <tny-simple-list.h>
+#include <tny-merge-folder.h>
typedef struct
{
tny_folder_add_msg (folder, msg, NULL); /* TODO: check err */
gdk_threads_enter ();
- ModestWindow *win = modest_msg_edit_window_new (msg, account_name);
+ ModestWindow *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_enter ();
- ModestWindow *win = modest_msg_edit_window_new (msg, account_name);
+ ModestWindow *win = modest_msg_edit_window_new (msg, account_name, FALSE);
/* it seems Sketch at least sends a leading ',' -- take that into account,
* ie strip that ,*/
list = g_strsplit(idle_data->attachments, ",", 0);
for (i=0; list[i] != NULL; i++) {
- modest_msg_edit_window_attach_file_noninteractive(
+ modest_msg_edit_window_attach_file_one(
(ModestMsgEditWindow *)win, list[i]);
}
g_strfreev(list);
folder = tny_msg_get_folder (msg);
/* Drafts will be opened in the editor, instead of the viewer, as per the UI spec: */
+ /* FIXME: same should happen for Outbox; not enabling that, as the handling
+ * of edited messages is not clear in that case */
gboolean is_draft = FALSE;
if (folder && modest_tny_folder_is_local_folder (folder) &&
- (modest_tny_folder_get_local_folder_type (folder) == TNY_FOLDER_TYPE_DRAFTS)) {
+ (modest_tny_folder_get_local_or_mmc_folder_type (folder) == TNY_FOLDER_TYPE_DRAFTS)) {
is_draft = TRUE;
}
if (is_draft) {
/* TODO: Maybe the msg_uid should be registered for edit windows too,
* so we can open the same window again next time: */
- msg_view = modest_msg_edit_window_new (msg, modest_account_name);
+ msg_view = modest_msg_edit_window_new (msg, modest_account_name, TRUE);
} else {
msg_view = modest_msg_view_window_new (msg, modest_account_name,
msg_uid);
static gboolean
on_idle_delete_message (gpointer user_data)
{
- TnyList *headers;
- TnyFolder *folder;
- TnyIterator *iter;
- TnyHeader *header;
- TnyHeader *msg_header;
- TnyMsg *msg;
- TnyAccount *account;
- GError *error;
- const char *uri;
- const char *uid;
- gint res;
+ TnyList *headers = NULL;
+ TnyFolder *folder = NULL;
+ TnyIterator *iter = NULL;
+ TnyHeader *header = NULL;
+ TnyHeader *msg_header = NULL;
+ TnyMsg *msg = NULL;
+ TnyAccount *account = NULL;
+ GError *error = NULL;
+ const char *uri = NULL;
+ const char *uid = NULL;
+ gint res = 0;
uri = (char *) user_data;
/* g_debug ("Searching header for msg in folder"); */
while (!tny_iterator_is_done (iter)) {
- const char *cur_id;
+ const char *cur_id = NULL;
header = TNY_HEADER (tny_iterator_get_current (iter));
- cur_id = tny_header_get_uid (header);
+ if (header)
+ cur_id = tny_header_get_uid (header);
if (cur_id && uid && g_str_equal (cur_id, uid)) {
/* g_debug ("Found corresponding header from folder"); */
break;
}
- header = NULL;
- g_object_unref (header);
+ if (header) {
+ g_object_unref (header);
+ header = NULL;
+ }
+
tny_iterator_next (iter);
}
msg = NULL;
if (header == NULL) {
- g_object_unref (folder);
+ if (folder)
+ g_object_unref (folder);
+
return OSSO_ERROR;
}
gdk_threads_leave ();
- g_object_unref (header);
- g_object_unref (folder);
+ if (header)
+ g_object_unref (header);
+
+ if (folder) {
+ /* Trick: do a poke status in order to speed up the signaling
+ of observers.
+ A delete via the menu does this, in do_headers_action(),
+ though I don't know why.
+ */
+ tny_folder_poke_status (folder);
+
+ g_object_unref (folder);
+ }
+
+ if (account)
+ g_object_unref (account);
+
+ /* Refilter the header view explicitly, to make sure that
+ * deleted emails are really removed from view.
+ * (They are not really deleted until contact is made with the server,
+ * so they would appear with a strike-through until then):
+ */
+ ModestHeaderView *header_view = MODEST_HEADER_VIEW(modest_main_window_get_child_widget (
+ MODEST_MAIN_WINDOW(win), MODEST_WIDGET_TYPE_HEADER_VIEW));
+ if (header_view && MODEST_IS_HEADER_VIEW (header_view))
+ modest_header_view_refilter (header_view);
+
return res;
}
+
+
+
static gint
on_delete_message (GArray *arguments, gpointer data, osso_rpc_t *retval)
{
/* Pick the main window if it exists */
win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ());
+ /* This seems to be necessary to show new messages in the current window.
+ * I would expect this to be after the send_receive, but maybe
+ * this makes a connection too. murrayc. */
+ modest_do_refresh_current_folder (win);
+
/* Send & receive all if "Update automatically" is set */
/* TODO: check the auto-update parameter in the configuration */
modest_ui_actions_do_send_receive_all (win);
static gint on_send_receive(GArray * arguments, gpointer data, osso_rpc_t * retval)
{
+ printf("DEBUG: modest: %s\n", __FUNCTION__);
/* Use g_idle to context-switch into the application's thread: */
/* This method has no arguments. */
return on_top_application (arguments, data, retval);
}
else {
- g_debug (" debug: %s: Unexpected D-Bus method: %s\n", __FUNCTION__, method);
-
/* We need to return INVALID here so
* libosso will return DBUS_HANDLER_RESULT_NOT_YET_HANDLED,
* so that our modest_dbus_req_filter will then be tried instead.
if (!folder)
return;
+ if (TNY_IS_MERGE_FOLDER (folder)) {
+ /* Ignore these because their IDs ares
+ * a) not always unique or sensible.
+ * b) not human-readable, and currently need a human-readable
+ * ID here, because the osso-email-interface API does not allow
+ * us to return both an ID and a display name.
+ *
+ * This is actually the merged outbox folder.
+ * We could hack our D-Bus API to understand "outbox" as the merged outboxes,
+ * but that seems unwise. murrayc.
+ */
+ return;
+ }
+
/* Add this folder to the list: */
/*
const gchar * folder_name = tny_folder_get_name (folder);
* 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 {
+ if (folder) {
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_get_current() gave us a reference. */
+ g_object_unref (folder);
}
- #endif
tny_iterator_next (iter);
}
g_object_unref (account);
account = NULL;
-
/* Also add the folders from the local folders account,
* 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 =
- modest_tny_account_store_get_local_folders_account (
- TNY_ACCOUNT_STORE (modest_runtime_get_account_store()));
+ 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);
if (dbus_message_is_method_call (message,
MODEST_DBUS_IFACE,
MODEST_DBUS_METHOD_SEARCH)) {
+ printf (" DEBUG1: %s\n", __FUNCTION__);
on_dbus_method_search (con, message);
handled = TRUE;
} else if (dbus_message_is_method_call (message,
MODEST_DBUS_IFACE,
MODEST_DBUS_METHOD_GET_FOLDERS)) {
+ printf (" DEBUG2: %s\n", __FUNCTION__);
on_dbus_method_get_folders (con, message);
handled = TRUE;
}
+ else {
+ /* Note that this mentions methods that were already handled in modest_dbus_req_handler(). */
+ g_debug (" debug: %s: Unexpected (maybe already handled) D-Bus method:\n Interface=%s, Member=%s\n",
+ __FUNCTION__, dbus_message_get_interface (message),
+ dbus_message_get_member(message));
+ }
return (handled ?
DBUS_HANDLER_RESULT_HANDLED :
projects / modest / blobdiff