Use empty strings instead of NULL in format_reply structure.

[notmuch] / notmuch-reply.c

diff --git a/notmuch-reply.c b/notmuch-reply.c
index b5ca19c46b6500eb6681acabff51a7d6c9d93aba..79599358fa23c481e1e109735bb05627bc43bf70 100644 (file)
--- a/notmuch-reply.c
+++ b/notmuch-reply.c
@@ -29,42 +29,14 @@ reply_part (GMimeObject *part,
            unused (int *part_count));
 
 static const notmuch_show_format_t format_reply = {
-    NULL,
-       NULL, NULL,
-           NULL, NULL, NULL,
-           NULL, reply_part, NULL, NULL, NULL,
-       NULL, NULL,
-    NULL
+    "",
+       "", NULL,
+           "", NULL, "",
+           "", reply_part, NULL, "", "",
+       "", "",
+    ""
 };
 
-static void
-reply_part_content (GMimeObject *part)
-{
-    GMimeStream *stream_stdout = NULL, *stream_filter = NULL;
-    GMimeDataWrapper *wrapper;
-    const char *charset;
-
-    charset = g_mime_object_get_content_type_parameter (part, "charset");
-    stream_stdout = g_mime_stream_file_new (stdout);
-    if (stream_stdout) {
-       g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE);
-       stream_filter = g_mime_stream_filter_new(stream_stdout);
-        if (charset) {
-          g_mime_stream_filter_add(GMIME_STREAM_FILTER(stream_filter),
-                                   g_mime_filter_charset_new(charset, "UTF-8"));
-        }
-    }
-    g_mime_stream_filter_add(GMIME_STREAM_FILTER(stream_filter),
-                            g_mime_filter_reply_new(TRUE));
-    wrapper = g_mime_part_get_content_object (GMIME_PART (part));
-    if (wrapper && stream_filter)
-       g_mime_data_wrapper_write_to_stream (wrapper, stream_filter);
-    if (stream_filter)
-       g_object_unref(stream_filter);
-    if (stream_stdout)
-       g_object_unref(stream_stdout);
-}
-
 static void
 show_reply_headers (GMimeMessage *message)
 {
@@ -88,41 +60,50 @@ static void
 reply_part (GMimeObject *part,
            unused (int *part_count))
 {
-    GMimeContentDisposition *disposition;
-    GMimeContentType *content_type;
+    GMimeContentType *content_type = g_mime_object_get_content_type (GMIME_OBJECT (part));
+    GMimeContentDisposition *disposition = g_mime_object_get_content_disposition (part);
 
-    disposition = g_mime_object_get_content_disposition (part);
-    if (disposition &&
-       strcmp (disposition->disposition, GMIME_DISPOSITION_ATTACHMENT) == 0)
+    if (g_mime_content_type_is_type (content_type, "text", "*") &&
+       !g_mime_content_type_is_type (content_type, "text", "html"))
     {
-       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"))
+       GMimeStream *stream_stdout = NULL, *stream_filter = NULL;
+       GMimeDataWrapper *wrapper;
+       const char *charset;
+
+       charset = g_mime_object_get_content_type_parameter (part, "charset");
+       stream_stdout = g_mime_stream_file_new (stdout);
+       if (stream_stdout) {
+           g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE);
+           stream_filter = g_mime_stream_filter_new(stream_stdout);
+           if (charset) {
+               g_mime_stream_filter_add(GMIME_STREAM_FILTER(stream_filter),
+                                        g_mime_filter_charset_new(charset, "UTF-8"));
+           }
+       }
+       g_mime_stream_filter_add(GMIME_STREAM_FILTER(stream_filter),
+                                g_mime_filter_reply_new(TRUE));
+       wrapper = g_mime_part_get_content_object (GMIME_PART (part));
+       if (wrapper && stream_filter)
+           g_mime_data_wrapper_write_to_stream (wrapper, stream_filter);
+       if (stream_filter)
+           g_object_unref(stream_filter);
+       if (stream_stdout)
+           g_object_unref(stream_stdout);
+    }
+    else
+    {
+       if (disposition &&
+           strcmp (disposition->disposition, GMIME_DISPOSITION_ATTACHMENT) == 0)
        {
-           reply_part_content (part);
+           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 ("Attachment: %s (%s)\n", filename,
+           printf ("Non-text part: %s\n",
                    g_mime_content_type_to_string (content_type));
        }
-
-       return;
-    }
-
-    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 ("Non-text part: %s\n",
-               g_mime_content_type_to_string (content_type));
     }
 }
 
@@ -461,6 +442,8 @@ notmuch_reply_format_default(void *ctx, notmuch_config_t *config, notmuch_query_
     const char *subject, *from_addr = NULL;
     const char *in_reply_to, *orig_references, *references;
     const notmuch_show_format_t *format = &format_reply;
+    notmuch_show_params_t params;
+    params.part = -1;
 
     for (messages = notmuch_query_search_messages (query);
         notmuch_messages_valid (messages);
@@ -520,7 +503,7 @@ notmuch_reply_format_default(void *ctx, notmuch_config_t *config, notmuch_query_
                notmuch_message_get_header (message, "from"));
 
        show_message_body (notmuch_message_get_filename (message),
-                          format);
+                          format, &params);
 
        notmuch_message_destroy (message);
     }