* Modified the order of the widget creation proccess

[modest] / src / modest-mail-operation.c

diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c
index db8b916..ba4e00c 100644 (file)
--- a/src/modest-mail-operation.c
+++ b/src/modest-mail-operation.c
@@ -218,8 +218,15 @@ modest_mail_operation_send_mail (ModestMailOperation *self,
        send_queue = TNY_SEND_QUEUE (modest_runtime_get_send_queue (transport_account));
        if (!TNY_IS_SEND_QUEUE(send_queue))
                g_printerr ("modest: could not find send queue for account\n");
-       else
-               tny_send_queue_add (send_queue, msg);
+       else {
+               GError *err = NULL;
+               tny_send_queue_add (send_queue, msg, &err);
+               if (err) {
+                       g_printerr ("modest: error adding msg to send queue: %s\n",
+                                   err->message);
+                       g_error_free (err);
+               }
+       }
 }
 
 void
@@ -657,9 +664,13 @@ modest_mail_operation_remove_folder (ModestMailOperation *self,
                                     gboolean remove_to_trash)
 {
        TnyFolderStore *folder_store;
+       ModestMailOperationPrivate *priv;
 
+       g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
        g_return_if_fail (TNY_IS_FOLDER (folder));
 
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
+
        /* Get folder store */
        folder_store = TNY_FOLDER_STORE (tny_folder_get_account (folder));
 
@@ -672,7 +683,9 @@ modest_mail_operation_remove_folder (ModestMailOperation *self,
                modest_mail_operation_move_folder (self, folder, 
                                                   TNY_FOLDER_STORE (trash_folder));
        } else {
-               tny_folder_store_remove_folder (folder_store, folder, NULL); /* FIXME */
+               tny_folder_store_remove_folder (folder_store, folder, &(priv->error));
+               CHECK_EXCEPTION (priv, MODEST_MAIL_OPERATION_STATUS_FAILED, );
+
                g_object_unref (G_OBJECT (folder));
        }