Fixes NB#96600, added feed protocol support

[modest] / src / modest-tny-msg.c

diff --git a/src/modest-tny-msg.c b/src/modest-tny-msg.c
index abdcf44..ba5c456 100644 (file)
--- a/src/modest-tny-msg.c
+++ b/src/modest-tny-msg.c
@@ -33,6 +33,7 @@
 #include <tny-simple-list.h>
 #include <tny-folder.h>
 #include <modest-runtime.h>
+#include <modest-defs.h>
 #include "modest-formatter.h"
 #include <tny-camel-mem-stream.h>
 #include <tny-camel-mime-part.h>
@@ -367,9 +368,9 @@ add_images (TnyMsg *msg, GList *images_list, GError **err)
                        if (part && !g_strcasecmp (tny_mime_part_get_content_type (part), "multipart/related")) {
                                related_part = part;
                                break;
-                       } else {
-                               g_object_unref (part);
                        }
+                       if (part)
+                               g_object_unref (part);
                        tny_iterator_next (iter);
                }
                g_object_unref (iter);
@@ -584,7 +585,8 @@ create_reply_forward_mail (TnyMsg *msg, TnyHeader *header, const gchar *from,
        ModestFormatter *formatter;
        gchar *subject_prefix;
        gboolean no_text_part;
-       
+       gchar *parent_uid;
+
        if (header)
                g_object_ref (header);
        else
@@ -625,7 +627,7 @@ create_reply_forward_mail (TnyMsg *msg, TnyHeader *header, const gchar *from,
                g_object_unref (G_OBJECT(body));
 
        /* Fill the header */
-       new_header = tny_msg_get_header (new_msg);      
+       new_header = tny_msg_get_header (new_msg);
        tny_header_set_from (new_header, from);
        tny_header_set_replyto (new_header, from);
 
@@ -642,13 +644,11 @@ create_reply_forward_mail (TnyMsg *msg, TnyHeader *header, const gchar *from,
        g_free (subject_prefix);
        tny_header_set_subject (new_header, (const gchar *) new_subject);
        g_free (new_subject);
-       
+
        /* get the parent uid, and set it as a gobject property on the new msg */
-       if (new_msg) {
-               gchar* parent_uid = modest_tny_folder_get_header_unique_id (header);
-               g_object_set_data_full (G_OBJECT(new_msg), MODEST_TNY_MSG_PARENT_UID,
-                                       parent_uid, g_free);
-       }
+       parent_uid = modest_tny_folder_get_header_unique_id (header);
+       g_object_set_data_full (G_OBJECT(new_msg), MODEST_TNY_MSG_PARENT_UID,
+                               parent_uid, g_free);
 
        /* set modest as the X-Mailer
         * we could this in the platform factory, but then the header
@@ -867,8 +867,7 @@ modest_tny_msg_create_reply_msg (TnyMsg *msg,
                g_list_foreach (attachments_list, (GFunc) g_object_unref, NULL);
                g_list_free (attachments_list);
        }
-       if (parts)
-               g_object_unref (G_OBJECT (parts));
+       g_object_unref (parts);
 
        /* Fill the header */
        if (header)