show: Remove support for old-style formatters in show_message

show_message used to have a compatibility path for old-style
formatters.  This removes that.

diff --git a/notmuch-show.c b/notmuch-show.c
index 7af8e64e49e83ca3d7002db83812fd0f77f7f0d7..69164bdae5346f404316776f9566b686298ca2d3 100644 (file)
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -815,46 +815,20 @@ show_message (void *ctx,
              int indent,
              notmuch_show_params_t *params)
 {
-    if (format->part) {
-       void *local = talloc_new (ctx);
-       mime_node_t *root, *part;
-       notmuch_status_t status;
-
-       status = mime_node_open (local, message, params->cryptoctx,
-                                params->decrypt, &root);
-       if (status)
-           goto DONE;
-       part = mime_node_seek_dfs (root, (params->part < 0 ? 0 : params->part));
-       if (part)
-           status = format->part (local, part, indent, params);
-      DONE:
-       talloc_free (local);
-       return status;
-    }
-
-    if (params->part <= 0) {
-       fputs (format->message_start, stdout);
-       if (format->message)
-           format->message(ctx, message, indent);
-
-       fputs (format->header_start, stdout);
-       if (format->header)
-           format->header(ctx, message);
-       fputs (format->header_end, stdout);
-
-       fputs (format->body_start, stdout);
-    }
-
-    if (format->part_content)
-       show_message_body (message, format, params);
-
-    if (params->part <= 0) {
-       fputs (format->body_end, stdout);
-
-       fputs (format->message_end, stdout);
-    }
+    void *local = talloc_new (ctx);
+    mime_node_t *root, *part;
+    notmuch_status_t status;
 
-    return NOTMUCH_STATUS_SUCCESS;
+    status = mime_node_open (local, message, params->cryptoctx,
+                            params->decrypt, &root);
+    if (status)
+       goto DONE;
+    part = mime_node_seek_dfs (root, (params->part < 0 ? 0 : params->part));
+    if (part)
+       status = format->part (local, part, indent, params);
+  DONE:
+    talloc_free (local);
+    return status;
 }
 
 static notmuch_status_t