X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=database.cc;h=5ee07059cda75569fe7e7bbfd6ffca6b23a4c823;hp=7e678d87b8a506524663814e55b502309c74ed37;hb=50144fb354dc5bf282c2a2cdc68c926e42ccf3ef;hpb=cd4a8734d3bb151df70d51a84903bff994439b05

diff --git a/database.cc b/database.cc
index 7e678d87..5ee07059 100644
--- a/database.cc
+++ b/database.cc
@@ -18,7 +18,7 @@
  * Author: Carl Worth <cworth@cworth.org>
  */
 
-#include "notmuch-private.h"
+#include "database-private.h"
 
 #include <iostream>
 
@@ -28,12 +28,6 @@
 
 using namespace std;
 
-struct _notmuch_database {
-    char *path;
-    Xapian::WritableDatabase *xapian_db;
-    Xapian::TermGenerator *term_gen;
-};
-
 #define ARRAY_SIZE(arr) (sizeof (arr) / sizeof (arr[0]))
 
 /* Xapian complains if we provide a term longer than this. */
@@ -524,8 +518,6 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
 					   (char *) NULL);
 
     try {
-	doc = Xapian::Document ();
-
 	doc.set_data (filename);
 
 	parents = g_ptr_array_new ();