}
-
-
-
static gboolean
on_idle_compose_mail(gpointer user_data)
{
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");
+ g_printerr ("modest: no account found.\n");
+
+ /* TODO: If the call to this D-Bus method caused the application to start
+ * then the new-account wizard will now be shown, and we need to wait
+ * until the account exists instead of just failing.
+ */
}
TnyAccount *account = NULL;
- if (account_mgr) {
+ if (account_name && account_mgr) {
account = modest_tny_account_store_get_transport_account_for_open_connection (
modest_runtime_get_account_store(), account_name);
}
uri);
if (account == NULL) {
- g_debug ("%s: tny_account_store_find_account() failed.\n", __FUNCTION__);
+ g_debug ("%s: tny_account_store_find_account() failed for\n uri=%s\n",
+ __FUNCTION__, uri);
return NULL;
}
&err);
if (folder == NULL) {
- g_debug ("%s: tny_store_account_find_folder() failed\naccount=%s, uri=%s.\n", __FUNCTION__,
+ g_debug ("%s: tny_store_account_find_folder() failed for\n account=%s, uri=%s.\n", __FUNCTION__,
tny_account_get_id (TNY_ACCOUNT(account)), uri);
goto out;
}
static gboolean
on_idle_open_message (gpointer user_data)
{
- ModestWindow *msg_view = NULL;
- TnyMsg *msg;
+ TnyMsg *msg = NULL;
TnyAccount *account = NULL;
- TnyHeader *header;
- const char *msg_uid;
- const char *account_name;
- char *uri;
- ModestWindowMgr *win_mgr;
+ TnyHeader *header = NULL;
+ const char *msg_uid = NULL;
+ char *uri = NULL;
+ ModestWindowMgr *win_mgr = NULL;
TnyFolder *folder = NULL;
uri = (char *) user_data;
}
g_debug ("modest: %s: Found message.", __FUNCTION__);
+
folder = tny_msg_get_folder (msg);
- if (modest_tny_folder_get_local_folder_type (folder) == TNY_FOLDER_TYPE_DRAFTS) {
- g_debug ("TODO: draft messages should be opened in edit mode... ");
+
+ /* Drafts will be opened in the editor, instead of the viewer, as per the UI spec: */
+ 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)) {
+ is_draft = TRUE;
}
header = tny_msg_get_header (msg);
- account_name = tny_account_get_name (account);
+
+ /* TODO: The modest_tny_folder_get_header_unique_id() documentation warns against
+ * using it with tny_msg_get_header(), and there is a
+ * " camel_folder_get_full_name: assertion `CAMEL_IS_FOLDER (folder)' failed" runtime warning,
+ * but it seems to work.
+ */
msg_uid = modest_tny_folder_get_header_unique_id(header);
-/* FIXME: modest_tny_folder_get_header_unique_id warns against this */
+
win_mgr = modest_runtime_get_window_mgr ();
gdk_threads_enter ();
+ gboolean already_opened = FALSE;
+ ModestWindow *msg_view = NULL;
if (modest_window_mgr_find_registered_header (win_mgr, header, &msg_view)) {
- g_debug ("modest: %s: A window for this messsage is open already.", __FUNCTION__);
- if (!MODEST_IS_MSG_VIEW_WINDOW(msg_view))
- g_debug (" DEBUG: But the window is not a msg view");
+ if (msg_view) {
+ g_debug ("modest: %s: A window for this message is open already: type=%s",
+ __FUNCTION__, G_OBJECT_TYPE_NAME (msg_view));
+ }
+
+ if (!msg_view)
+ g_debug ("modest_window_mgr_find_registered_header(): Returned TRUE, but msg_view is NULL");
+ else if (!MODEST_IS_MSG_VIEW_WINDOW (msg_view) && !MODEST_IS_MSG_EDIT_WINDOW (msg_view))
+ g_debug (" DEBUG: But the window is not a msg view or edit window.");
else {
gtk_window_present (GTK_WINDOW(msg_view));
+ already_opened = TRUE;
}
- } else {
+ }
+
+ if (!already_opened) {
/* g_debug ("creating new window for this msg"); */
modest_window_mgr_register_header (win_mgr, header);
- msg_view = modest_msg_view_window_new (msg,account_name,
+
+ const gchar *modest_account_name =
+ modest_tny_account_get_parent_modest_account_name_for_server_account (account);
+
+ /* Drafts will be opened in the editor, and others will be opened in the viewer,
+ * as per the UI spec: */
+ 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);
+ } else {
+ msg_view = modest_msg_view_window_new (msg, modest_account_name,
msg_uid);
+ }
+
modest_window_mgr_register_window (win_mgr, msg_view);
gtk_widget_show_all (GTK_WIDGET (msg_view));
}
error = NULL;
res = OSSO_OK;
- tny_folder_remove_msg (folder, header, &error);
- tny_header_set_flags (header, TNY_HEADER_FLAG_SEEN);
+
+ gdk_threads_enter ();
+ 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);
}
- gdk_threads_enter ();
+
ModestWindowMgr *win_mgr = modest_runtime_get_window_mgr ();
ModestWindow *msg_view = NULL;
return OSSO_OK;
}
+static gboolean on_idle_top_application (gpointer user_data);
+
static gboolean
on_idle_open_default_inbox(gpointer user_data)
{
gdk_threads_leave ();
+ /* This D-Bus method is obviously meant to result in the UI being visible,
+ * so show it, by calling this idle handler directly: */
+ on_idle_top_application(user_data);
+
return FALSE; /* Do not call this callback again. */
}
projects / modest / blobdiff