X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=lib%2Fdirectory.cc;fp=lib%2Fdirectory.cc;h=946be4f45ef0704ea50041a45c4a20a0d6e48c95;hp=16492c0d754d9bf6ccfaf46c3ed96b2519410c50;hb=1d02dd64afe245a2b5a8461feeba975e61f0c233;hpb=d87db8843266caf6b11c1f2f1874328830b23878

diff --git a/lib/directory.cc b/lib/directory.cc
index 16492c0d..946be4f4 100644
--- a/lib/directory.cc
+++ b/lib/directory.cc
@@ -33,12 +33,12 @@ _create_filenames_for_terms_with_prefix (void *ctx,
 					 notmuch_database_t *notmuch,
 					 const char *prefix)
 {
-    notmuch_filenames_t *filenames;
+    notmuch_filename_list_t *filename_list;
     Xapian::TermIterator i, end;
     int prefix_len = strlen (prefix);
 
-    filenames = _notmuch_filenames_create (ctx);
-    if (unlikely (filenames == NULL))
+    filename_list = _notmuch_filename_list_create (ctx);
+    if (unlikely (filename_list == NULL))
 	return NULL;
 
     end = notmuch->xapian_db->allterms_end (prefix);
@@ -47,13 +47,11 @@ _create_filenames_for_terms_with_prefix (void *ctx,
     {
 	std::string term = *i;
 
-	_notmuch_filenames_add_filename (filenames, term.c_str () +
-					 prefix_len);
+	_notmuch_filename_list_add_filename (filename_list, term.c_str () +
+					     prefix_len);
     }
 
-    _notmuch_filenames_move_to_first (filenames);
-
-    return filenames;
+    return _notmuch_filenames_create (ctx, filename_list);
 }
 
 struct _notmuch_directory {