From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Thu, 26 May 2011 01:01:10 +0000 (-0700)
Subject: Simplify reply_part function to eliminate redundant code paths.
X-Git-Tag: debian/0.6_254~103
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=03ac922c4b4b542658a1c20e152df0ed63299c81

Simplify reply_part function to eliminate redundant code paths.

This is the same logic but with less code.
---

diff --git a/notmuch-reply.c b/notmuch-reply.c
index ab156508..5d72b1fd 100644
--- a/notmuch-reply.c
+++ b/notmuch-reply.c
@@ -88,31 +88,8 @@ static void
 reply_part (GMimeObject *part,
 	    unused (int *part_count))
 {
-    GMimeContentDisposition *disposition;
-    GMimeContentType *content_type;
-
-    disposition = g_mime_object_get_content_disposition (part);
-    if (disposition &&
-	strcmp (disposition->disposition, GMIME_DISPOSITION_ATTACHMENT) == 0)
-    {
-	const char *filename = g_mime_part_get_filename (GMIME_PART (part));
-	content_type = g_mime_object_get_content_type (GMIME_OBJECT (part));
-
-	if (g_mime_content_type_is_type (content_type, "text", "*") &&
-	    !g_mime_content_type_is_type (content_type, "text", "html"))
-	{
-	    reply_part_content (part);
-	}
-	else
-	{
-	    printf ("Attachment: %s (%s)\n", filename,
-		    g_mime_content_type_to_string (content_type));
-	}
-
-	return;
-    }
-
-    content_type = g_mime_object_get_content_type (GMIME_OBJECT (part));
+    GMimeContentType *content_type = g_mime_object_get_content_type (GMIME_OBJECT (part));
+    GMimeContentDisposition *disposition = g_mime_object_get_content_disposition (part);
 
     if (g_mime_content_type_is_type (content_type, "text", "*") &&
 	!g_mime_content_type_is_type (content_type, "text", "html"))
@@ -121,8 +98,18 @@ reply_part (GMimeObject *part,
     }
     else
     {
-	printf ("Non-text part: %s\n",
-		g_mime_content_type_to_string (content_type));
+	if (disposition &&
+	    strcmp (disposition->disposition, GMIME_DISPOSITION_ATTACHMENT) == 0)
+	{
+	    const char *filename = g_mime_part_get_filename (GMIME_PART (part));
+	    printf ("Attachment: %s (%s)\n", filename,
+		    g_mime_content_type_to_string (content_type));
+	}
+	else
+	{
+	    printf ("Non-text part: %s\n",
+		    g_mime_content_type_to_string (content_type));
+	}
     }
 }