diff options
| author |  Carl Worth <cworth@cworth.org> | 2009-11-15 20:29:13 -0800 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2009-11-15 20:31:30 -0800 |
| commit | f970d8078cc29f876bebe02937307a5a8f2d394f (patch) | |
| tree | dfa44c7e8c80f5b03529ad059f8552f79455e220 /lib/query.cc | |
| parent | 9034e396b60f380373ca3f1751f06d31bfb954c2 (diff) | |
lib/messages: Add new notmuch_message_list_t to internal interface.
Previously, the notmuch_messages_t object was a linked list built on
top of a linked-list node with the odd name of notmuch_message_list_t.
Now, we've got much more sane naming with notmuch_message_list_t being
a list built on a linked-list node named notmuch_message_node_t. And
now the public notmuch_messages_t object is a separate iterator based
on notmuch_message_node_t. This means the interfaces for the new
notmuch_message_list_t object are now made available to the library
internals.
Diffstat (limited to 'lib/query.cc')
| -rw-r--r-- | lib/query.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/query.cc b/lib/query.cc index d499a219..a70be1dd 100644 --- a/lib/query.cc +++ b/lib/query.cc @@ -79,11 +79,11 @@ notmuch_query_search_messages (notmuch_query_t *query, { notmuch_database_t *notmuch = query->notmuch; const char *query_string = query->query_string; - notmuch_messages_t *messages; + notmuch_message_list_t *message_list; Xapian::MSetIterator i; - messages = _notmuch_messages_create (query); - if (unlikely (messages == NULL)) + message_list = _notmuch_message_list_create (query); + if (unlikely (message_list == NULL)) return NULL; try { @@ -134,7 +134,7 @@ notmuch_query_search_messages (notmuch_query_t *query, notmuch_message_t *message; notmuch_private_status_t status; - message = _notmuch_message_create (messages, notmuch, + message = _notmuch_message_create (message_list, notmuch, *i, &status); if (message == NULL) { @@ -144,7 +144,7 @@ notmuch_query_search_messages (notmuch_query_t *query, break; } - _notmuch_messages_add_message (messages, message); + _notmuch_message_list_add_message (message_list, message); } } catch (const Xapian::Error &error) { @@ -152,7 +152,7 @@ notmuch_query_search_messages (notmuch_query_t *query, error.get_msg().c_str()); } - return messages; + return _notmuch_messages_create (message_list); } /* Glib objects force use to use a talloc destructor as well, (but not |