Nuke the remainings of _notmuch_message_add_thread_id.

[notmuch] / lib / notmuch-private.h

diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h
index 2b4bf319cf8c3e683ca4c715f377c0a33c0a038d..116f63d6463e251f36e5f63a12fa72589466d03e 100644 (file)
--- a/lib/notmuch-private.h
+++ b/lib/notmuch-private.h
@@ -26,6 +26,8 @@
 #endif
 #include <stdio.h>
 
+#include "compat.h"
+
 #include "notmuch.h"
 
 NOTMUCH_BEGIN_DECLS
@@ -191,10 +193,6 @@ void
 _notmuch_message_set_filename (notmuch_message_t *message,
                               const char *filename);
 
-void
-_notmuch_message_add_thread_id (notmuch_message_t *message,
-                               const char *thread_id);
-
 void
 _notmuch_message_ensure_thread_id (notmuch_message_t *message);
 
@@ -290,6 +288,15 @@ typedef struct _notmuch_message_list {
     notmuch_message_node_t **tail;
 } notmuch_message_list_t;
 
+/* There's a rumor that there's an alternate struct _notmuch_messages
+ * somewhere with some nasty C++ objects in it. We'll try to maintain
+ * ignorance of that here. (See notmuch_mset_messages_t in query.cc)
+ */
+struct _notmuch_messages {
+    notmuch_bool_t is_of_list_type;
+    notmuch_message_node_t *iterator;
+};
+
 notmuch_message_list_t *
 _notmuch_message_list_create (const void *ctx);
 
@@ -304,24 +311,23 @@ _notmuch_message_list_add_message (notmuch_message_list_t *list,
 notmuch_messages_t *
 _notmuch_messages_create (notmuch_message_list_t *list);
 
+/* query.cc */
+
+notmuch_bool_t
+_notmuch_mset_messages_has_more (notmuch_messages_t *messages);
+
+notmuch_message_t *
+_notmuch_mset_messages_get (notmuch_messages_t *messages);
+
+void
+_notmuch_mset_messages_advance (notmuch_messages_t *messages);
+
 /* message.cc */
 
 void
 _notmuch_message_add_reply (notmuch_message_t *message,
                            notmuch_message_node_t *reply);
 
-/* date.c */
-
-/* Parse an RFC 8222 date string to a time_t value.
- *
- * The tz_offset argument can be used to also obtain the time-zone
- * offset, (but can be NULL if the call is not interested in that).
- *
- * Returns 0 on error.
- */
-time_t
-notmuch_parse_date (const char *str, int *tz_offset);
-
 /* sha1.c */
 
 char *