Fixes FwNULL 10/16

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

diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c
index c0e721c..79d9c47 100644 (file)
--- a/src/modest-mail-operation.c
+++ b/src/modest-mail-operation.c
@@ -1232,16 +1232,18 @@ modest_mail_operation_save_to_drafts_cb (ModestMailOperation *self,
        }
 
        if (!priv->error || priv->error->code == MODEST_MAIL_OPERATION_ERROR_FILE_IO) {
-               SaveToDraftsAddMsgInfo *cb_info = g_slice_new(SaveToDraftsAddMsgInfo);
-               cb_info->transport_account = g_object_ref(info->transport_account);
-               cb_info->draft_msg = info->draft_msg ? g_object_ref(info->draft_msg) : NULL;
-               cb_info->callback = info->callback;
-               cb_info->user_data = info->user_data;
-               cb_info->drafts = g_object_ref(drafts);
-               cb_info->msg = g_object_ref(msg);
-               cb_info->mailop = g_object_ref(self);
-               tny_folder_add_msg_async(drafts, msg, modest_mail_operation_save_to_drafts_add_msg_cb,
-                                        NULL, cb_info);
+               if (drafts) {
+                       SaveToDraftsAddMsgInfo *cb_info = g_slice_new(SaveToDraftsAddMsgInfo);
+                       cb_info->transport_account = g_object_ref(info->transport_account);
+                       cb_info->draft_msg = info->draft_msg ? g_object_ref(info->draft_msg) : NULL;
+                       cb_info->callback = info->callback;
+                       cb_info->user_data = info->user_data;
+                       cb_info->drafts = g_object_ref(drafts);
+                       cb_info->msg = g_object_ref(msg);
+                       cb_info->mailop = g_object_ref(self);
+                       tny_folder_add_msg_async(drafts, msg, modest_mail_operation_save_to_drafts_add_msg_cb,
+                                                NULL, cb_info);
+               }
        } else {
                /* Call the user callback */
                priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
@@ -1559,7 +1561,8 @@ inbox_refreshed_cb (TnyFolder *inbox,
                                     MODEST_MAIL_OPERATION_ERROR_OPERATION_CANCELED,
                                     "canceled");
 
-               tny_folder_remove_observer (inbox, info->inbox_observer);
+               if (inbox)
+                       tny_folder_remove_observer (inbox, info->inbox_observer);
                g_object_unref (info->inbox_observer);
                info->inbox_observer = NULL;
 
@@ -1596,7 +1599,7 @@ inbox_refreshed_cb (TnyFolder *inbox,
                        /* Apply per-message size limits */
                        if (tny_header_get_message_size (header) < max_size)
                                g_ptr_array_add (new_headers_array, g_object_ref (header));
-                       
+
                        g_object_unref (header);
                        tny_iterator_next (new_headers_iter);
                }
@@ -1616,14 +1619,14 @@ inbox_refreshed_cb (TnyFolder *inbox,
        retrieve_limit = modest_account_mgr_get_retrieve_limit (mgr, info->account_name);
        if (retrieve_limit == 0)
                retrieve_limit = G_MAXINT;
-       
+
        /* Get per-account retrieval type */
        retrieve_type = modest_account_mgr_get_retrieve_type (mgr, info->account_name);
        headers_only = (retrieve_type == MODEST_ACCOUNT_RETRIEVE_HEADERS_ONLY);
 
        /* Order by date */
        g_ptr_array_sort (new_headers_array, (GCompareFunc) compare_headers_by_date);
-       
+
        /* Ask the users if they want to retrieve all the messages
           even though the limit was exceeded */
        ignore_limit = FALSE;
@@ -1646,7 +1649,7 @@ inbox_refreshed_cb (TnyFolder *inbox,
        }
        g_ptr_array_foreach (new_headers_array, (GFunc) g_object_unref, NULL);
        g_ptr_array_free (new_headers_array, FALSE);
-       
+
        if (!headers_only && (tny_list_get_length (new_headers) > 0)) {
                gint msg_num = 0;
                TnyIterator *iter;
@@ -1667,16 +1670,16 @@ inbox_refreshed_cb (TnyFolder *inbox,
                msg_info->more_msgs = g_object_ref (iter);
                msg_info->user_data = info;
 
-               while ((msg_num < priv->total ) && !tny_iterator_is_done (iter)) {              
+               while ((msg_num < priv->total ) && !tny_iterator_is_done (iter)) {
                        TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
                        TnyFolder *folder = tny_header_get_folder (header);
 
                        /* Get message in an async way */
-                       tny_folder_get_msg_async (folder, header, update_account_get_msg_async_cb, 
+                       tny_folder_get_msg_async (folder, header, update_account_get_msg_async_cb,
                                                  NULL, msg_info);
 
                        g_object_unref (folder);
-                       
+
                        msg_num++;
                        tny_iterator_next (iter);
                }
@@ -1690,11 +1693,11 @@ inbox_refreshed_cb (TnyFolder *inbox,
        /* If we don't have to retrieve the new messages then
           simply send mail */
        update_account_send_mail (info);
-       
+
        /* Check if the operation was a success */
        if (!priv->error)
                priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
-       
+
        /* Call the user callback and free */
        update_account_notify_user_and_free (info, new_headers);
 }
@@ -1966,9 +1969,9 @@ compare_headers_by_date (gconstpointer a,
        /* We want the most recent ones (greater time_t) at the
           beginning */
        if (sent1 < sent2)
-               return 1;
-       else
                return -1;
+       else
+               return 1;
 }
 
 
@@ -2225,8 +2228,10 @@ transfer_folder_cb (TnyFolder *folder,
        }
 
        /* Update state of new folder */
-       tny_folder_refresh_async (new_folder, NULL, NULL, NULL);
-       tny_folder_poke_status (new_folder);
+       if (new_folder) {
+               tny_folder_refresh_async (new_folder, NULL, NULL, NULL);
+               tny_folder_poke_status (new_folder);
+       }
 
        /* Notify about operation end */
        modest_mail_operation_notify_end (self);