[balsa/gmime3: 25/49] Cleanup

[Peter Bloomfield <peterb src gnome org>]

commit 0ee59b9345c0b500d875ab5ca61228e239947ae7
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Fri Nov 22 13:19:19 2019 -0800

    Cleanup
    
    after commit 5726023cef89db5d810130a8b89fbdd2b253129b
    
    modified:   libbalsa/message.c

 libbalsa/message.c | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)
---
diff --git a/libbalsa/message.c b/libbalsa/message.c
index 5633c9792..f1b3afd5d 100644
--- a/libbalsa/message.c
+++ b/libbalsa/message.c
@@ -965,7 +965,7 @@ libbalsa_message_get_no(LibBalsaMessage* msg)
 }
 
 
-#endif
+#endif /* MESSAGE_COPY_CONTENT */
 
 /* Populate headers from mime_msg, but only the members that are needed
  * all the time. */
@@ -989,7 +989,7 @@ lb_message_recipients(GMimeMessage   * message,
 
 static void
 lb_message_headers_basic_from_gmime(LibBalsaMessageHeaders *headers,
-                                   GMimeMessage *mime_msg)
+                                    GMimeMessage           *mime_msg)
 {
     if (headers->from == NULL) {
         headers->from =
@@ -1001,6 +1001,7 @@ lb_message_headers_basic_from_gmime(LibBalsaMessageHeaders *headers,
 
         datetime = g_mime_message_get_date(mime_msg);
         headers->date = g_date_time_to_unix(datetime);
+        g_date_time_unref(datetime);
     }
 
     if (headers->to_list == NULL)
@@ -1008,18 +1009,18 @@ lb_message_headers_basic_from_gmime(LibBalsaMessageHeaders *headers,
             lb_message_recipients(mime_msg, GMIME_ADDRESS_TYPE_TO);
 
     if (headers->content_type == NULL) {
-       /* If we could:
-        * headers->content_type =
-        *     g_mime_content_type_copy
-        *         (g_mime_object_get_content_type(mime_msg->mime_part));
-        */
-       GMimeContentType *content_type;
-       gchar *str;
-
-       content_type = g_mime_object_get_content_type(mime_msg->mime_part);
-       str = g_mime_content_type_get_mime_type(content_type);
-       headers->content_type = g_mime_content_type_parse(libbalsa_parser_options(), str);
-       g_free(str);
+        /* If we could:
+         * headers->content_type =
+         *     g_mime_content_type_copy
+         *         (g_mime_object_get_content_type(mime_msg->mime_part));
+         */
+        GMimeContentType *content_type;
+        gchar *str;
+
+        content_type = g_mime_object_get_content_type(mime_msg->mime_part);
+        str = g_mime_content_type_get_mime_type(content_type);
+        headers->content_type = g_mime_content_type_parse(libbalsa_parser_options(), str);
+        g_free(str);
     }
 }
 
@@ -1027,11 +1028,8 @@ lb_message_headers_basic_from_gmime(LibBalsaMessageHeaders *headers,
  * lb_message_headers_basic_from_gmime. */
 static void
 lb_message_headers_extra_from_gmime(LibBalsaMessageHeaders *headers,
-                                   GMimeMessage *mime_msg)
+                                    GMimeMessage           *mime_msg)
 {
-    g_return_if_fail(headers);
-    g_return_if_fail(mime_msg != NULL);
-
     if (headers->reply_to == NULL) {
         headers->reply_to =
             lb_message_address_list_ref(g_mime_message_get_reply_to(mime_msg));
@@ -1057,9 +1055,10 @@ lb_message_headers_extra_from_gmime(LibBalsaMessageHeaders *headers,
     }
 
     /* Get fcc from message */
-    if (!headers->fcc_url)
+    if (headers->fcc_url == NULL) {
        headers->fcc_url =
            g_strdup(g_mime_object_get_header(GMIME_OBJECT(mime_msg), "X-Balsa-Fcc"));
+    }
 }
 
 /* Populate headers from the info in mime_msg. */