 +{
 +  gchar *query_term;                    /* what the query uses to get this */
 +  gchar *index_name;                    /* name for index */
-+  EContactField vfield;                 /* the (vcard) field this an index of */
-+  EBookBackendFileIndexFieldType type;  /* the type of this field */
++  gchar *vfield;                        /* the (vcard) field this an index of */
 +} EBookBackendFileIndexData;
 +
 +static const EBookBackendFileIndexData indexes[] = {
-+  {"full-name", "full_name", E_CONTACT_FULL_NAME, INDEX_FIELD_TYPE_STRING},
-+  {"im-jabber", "im_jabber", E_CONTACT_IM_JABBER, INDEX_FIELD_TYPE_STRING_LIST},
++  {"full-name", "full_name", EVC_FN},
++  {"im-jabber", "im_jabber", EVC_X_JABBER},
++  {"tel", "tel", EVC_TEL},
 +};
 +
 +typedef struct _EBookBackendFileIndexPrivate EBookBackendFileIndexPrivate;

+  gchar *uid = NULL;
+  DBT index_dbt, id_dbt;
+  DB *db = NULL;
+  gchar *value; /* for the INDEX_FIELD_TYPE_STRING case */
+  GList *l, *values; /* for the INDEX_FIELD_TYPE_STRING_LIST case */
+  gint db_error = 0;
+  gchar *tmp = NULL;
+

Index: git-foo/addressbook/backends/file/Makefile.am
===================================================================
--- git-foo.orig/addressbook/backends/file/Makefile.am	2008-05-07 17:17:14.000000000 +0100
+++ git-foo/addressbook/backends/file/Makefile.am	2008-05-07 17:17:14.000000000 +0100
@@ -12,6 +12,8 @@
 libebookbackendfile_la_SOURCES =			\
 	e-book-backend-file.c				\
