* src/widgets/modest-header-view-render.c:

[modest] / src / modest-tny-send-queue.c

diff --git a/src/modest-tny-send-queue.c b/src/modest-tny-send-queue.c
index 390f7e3..cefdd25 100644 (file)
--- a/src/modest-tny-send-queue.c
+++ b/src/modest-tny-send-queue.c
@@ -426,23 +426,27 @@ static void _on_msg_error_happened (TnySendQueue *self,
        ModestTnySendQueuePrivate *priv;
        SendInfo *info;
        GList *item;
+       TnyHeader *msg_header;
 
        priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self);
 
        /* TODO: Use this version as soon as the msg-sending
         *  notification works */
-#if 0
-       item = priv->current;
-       g_assert(item != NULL);
-       info = priv->current->data;
-#else
-       /* TODO: Why do we get the msg and its header separately? The docs
-        * don't really tell. */
-       g_assert(header == tny_msg_get_header (msg)); // ????
-       item = modest_tny_send_queue_lookup_info (MODEST_TNY_SEND_QUEUE (self), tny_header_get_message_id (header));
+/* #if 0 */
+/*     item = priv->current; */
+/*     g_assert(item != NULL); */
+/*     info = priv->current->data; */
+/* #else */
+/*     /\* TODO: Why do we get the msg and its header separately? The docs */
+/*      * don't really tell. *\/ */
+/*     g_assert(header == tny_msg_get_header (msg)); // ???? */
+       msg_header = tny_msg_get_header (msg);
+       item = modest_tny_send_queue_lookup_info (MODEST_TNY_SEND_QUEUE (self), 
+                                                 tny_header_get_message_id (msg_header));
+       g_object_unref (msg_header);
        g_assert(item != NULL);
        info = item->data;
-#endif
+/* #endif */
 
        /* Keep in queue so that we remember that the opertion has failed
         * and was not just cancelled */