Use stock GMimeSession by default

[notmuch] / notmuch-client.h

diff --git a/notmuch-client.h b/notmuch-client.h
index 1dbd987dfd0a5d588b57e355eca7ea178c17cd47..63be33741a212ac2ed03434418373c1481faff76 100644 (file)
--- a/notmuch-client.h
+++ b/notmuch-client.h
@@ -54,6 +54,38 @@
 #define STRINGIFY(s) STRINGIFY_(s)
 #define STRINGIFY_(s) #s
 
+typedef struct notmuch_show_format {
+    const char *message_set_start;
+    const char *message_start;
+    void (*message) (const void *ctx,
+                    notmuch_message_t *message,
+                    int indent);
+    const char *header_start;
+    void (*header) (const void *ctx,
+                   notmuch_message_t *message);
+    const char *header_end;
+    const char *body_start;
+    void (*part_start) (GMimeObject *part,
+                       int *part_count);
+    void (*part_encstatus) (int status);
+    void (*part_sigstatus) (const GMimeSignatureValidity* validity);
+    void (*part_content) (GMimeObject *part);
+    void (*part_end) (GMimeObject *part);
+    const char *part_sep;
+    const char *body_end;
+    const char *message_end;
+    const char *message_set_sep;
+    const char *message_set_end;
+} notmuch_show_format_t;
+
+typedef struct notmuch_show_params {
+    int entire_thread;
+    int raw;
+    int part;
+    GMimeCipherContext* cryptoctx;
+    int decrypt;
+} notmuch_show_params_t;
+
 /* There's no point in continuing when we've detected that we've done
  * something wrong internally (as opposed to the user passing in a
  * bogus value).
@@ -113,9 +145,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[]);
 
@@ -133,8 +162,8 @@ query_string_from_args (void *ctx, int argc, char *argv[]);
 
 notmuch_status_t
 show_message_body (const char *filename,
-                  void (*show_part) (GMimeObject *part, int *part_count, int first),
-                  void (*show_part_end) (GMimeObject *part));
+                  const notmuch_show_format_t *format,
+                  notmuch_show_params_t *params);
 
 notmuch_status_t
 show_one_part (const char *filename, int part);