test: Expand multipart test to cover part output in all formats.

[notmuch] / notmuch-client.h

diff --git a/notmuch-client.h b/notmuch-client.h
index 8899ab26f904cfca1aa0d611e0ce696c19cba8f2..7221c68108a59174b83835f61943df91928b7a50 100644 (file)
--- a/notmuch-client.h
+++ b/notmuch-client.h
@@ -66,9 +66,9 @@ typedef struct notmuch_show_format {
     const char *header_end;
     const char *body_start;
     void (*part) (GMimeObject *part,
-                 int *part_count,
-                 int first);
+                 int *part_count);
     void (*part_end) (GMimeObject *part);
+    const char *part_sep;
     const char *body_end;
     const char *message_end;
     const char *message_set_sep;
@@ -77,6 +77,8 @@ typedef struct notmuch_show_format {
 
 typedef struct notmuch_show_params {
     int entire_thread;
+    int raw;
+    int part;
 } notmuch_show_params_t;
 
 /* There's no point in continuing when we've detected that we've done
@@ -138,9 +140,6 @@ notmuch_search_tags_command (void *ctx, int argc, char *argv[]);
 int
 notmuch_cat_command (void *ctx, int argc, char *argv[]);
 
-int
-notmuch_part_command (void *ctx, int argc, char *argv[]);
-
 int
 notmuch_config_command (void *ctx, int argc, char *argv[]);
 
@@ -158,7 +157,8 @@ query_string_from_args (void *ctx, int argc, char *argv[]);
 
 notmuch_status_t
 show_message_body (const char *filename,
-                  const notmuch_show_format_t *format);
+                  const notmuch_show_format_t *format,
+                  notmuch_show_params_t *params);
 
 notmuch_status_t
 show_one_part (const char *filename, int part);