X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-client.h;h=77766de2cb56cda4bb8ac019426e16380c380839;hp=1081a159db573cc0bcfc23bf7593822a8532f26d;hb=909f52bd8c4bdfa11cd3e75e3d0959e0293689bd;hpb=fc2053b022e9b87928a29fa4af111f0cfce719fe

diff --git a/notmuch-client.h b/notmuch-client.h
index 1081a159..77766de2 100644
--- a/notmuch-client.h
+++ b/notmuch-client.h
@@ -21,12 +21,13 @@
 #ifndef NOTMUCH_CLIENT_H
 #define NOTMUCH_CLIENT_H
 
-
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE /* for getline */
 #endif
 #include <stdio.h>
 
+#include "compat.h"
+
 #include <gmime/gmime.h>
 
 #include "notmuch.h"
@@ -69,29 +70,6 @@
 #define STRNCMP_LITERAL(var, literal) \
     strncmp ((var), (literal), sizeof (literal) - 1)
 
-typedef int (*command_function_t) (void *ctx, int argc, char *argv[]);
-
-typedef struct command {
-    const char *name;
-    command_function_t function;
-    const char *summary;
-    const char *documentation;
-} command_t;
-
-typedef void (*add_files_callback_t) (notmuch_message_t *message);
-
-typedef struct {
-    int ignore_read_only_directories;
-    int saw_read_only_directory;
-
-    int total_files;
-    int processed_files;
-    int added_messages;
-    struct timeval tv_start;
-
-    add_files_callback_t callback;
-} add_files_state_t;
-
 static inline void
 chomp_newline (char *str)
 {
@@ -99,6 +77,9 @@ chomp_newline (char *str)
 	str[strlen(str)-1] = '\0';
 }
 
+int
+notmuch_count_command (void *ctx, int argc, char *argv[]);
+
 int
 notmuch_dump_command (void *ctx, int argc, char *argv[]);
 
@@ -123,8 +104,11 @@ notmuch_show_command (void *ctx, int argc, char *argv[]);
 int
 notmuch_tag_command (void *ctx, int argc, char *argv[]);
 
+int
+notmuch_search_tags_command (void *ctx, int argc, char *argv[]);
+
 const char *
-notmuch_time_relative_date (void *ctx, time_t then);
+notmuch_time_relative_date (const void *ctx, time_t then);
 
 void
 notmuch_time_print_formatted_seconds (double seconds);
@@ -132,10 +116,6 @@ notmuch_time_print_formatted_seconds (double seconds);
 double
 notmuch_time_elapsed (struct timeval start, struct timeval end);
 
-notmuch_status_t
-add_files (notmuch_database_t *notmuch, const char *path,
-	   add_files_state_t *state);
-
 char *
 query_string_from_args (void *ctx, int argc, char *argv[]);
 
@@ -188,4 +168,7 @@ notmuch_config_set_user_other_email (notmuch_config_t *config,
 				     const char *other_email[],
 				     size_t length);
 
+notmuch_bool_t
+debugger_is_active (void);
+
 #endif