From fd1ac9d405835b12fae2ac050c18d84c1fc3e540 Mon Sep 17 00:00:00 2001 From: Sergio Villar Senin Date: Wed, 30 Jan 2008 11:43:48 +0000 Subject: [PATCH 1/1] * Fixes NB#80070 do not allow to move a message in the viewer that has been sent, fixes a crash as well pmo-trunk-r4111 --- src/maemo/modest-msg-view-window.c | 10 +++------- src/modest-tny-send-queue.c | 3 +++ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/maemo/modest-msg-view-window.c b/src/maemo/modest-msg-view-window.c index e394955..7eb70ac 100644 --- a/src/maemo/modest-msg-view-window.c +++ b/src/maemo/modest-msg-view-window.c @@ -1186,7 +1186,9 @@ modest_msg_view_window_get_header (ModestMsgViewWindow *self) /* If the message was not obtained from a treemodel, * for instance if it was opened directly by the search UI: */ - if (priv->header_model == NULL || priv->row_reference == NULL) { + if (priv->header_model == NULL || + priv->row_reference == NULL || + !gtk_tree_row_reference_valid (priv->row_reference)) { msg = modest_msg_view_window_get_message (self); if (msg) { header = tny_msg_get_header (msg); @@ -1196,12 +1198,6 @@ modest_msg_view_window_get_header (ModestMsgViewWindow *self) } /* Get iter of the currently selected message in the header view: */ - /* TODO: Why not just give this window a ref of the TnyHeader or TnyMessage, - * instead of sometimes retrieving it from the header view? - * Then we wouldn't be dependent on the message actually still being selected - * in the header view. murrayc. */ - if (!gtk_tree_row_reference_valid (priv->row_reference)) - return NULL; path = gtk_tree_row_reference_get_path (priv->row_reference); g_return_val_if_fail (path != NULL, NULL); gtk_tree_model_get_iter (priv->header_model, diff --git a/src/modest-tny-send-queue.c b/src/modest-tny-send-queue.c index 8a6b9a1..9db9a6f 100644 --- a/src/modest-tny-send-queue.c +++ b/src/modest-tny-send-queue.c @@ -748,6 +748,9 @@ modest_tny_send_queue_wakeup (ModestTnySendQueue *self) tny_iterator_next (iter); } + /* Make changes persistent on disk */ + tny_folder_sync (priv->outbox, FALSE, NULL); + /* Frees */ g_object_unref (iter); g_object_unref (G_OBJECT (headers)); -- 1.7.9.5