 +  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 */
++  GList *attrs; 
++  GList *values;
 +  gint db_error = 0;
 +  gchar *tmp = NULL;
 +

Index: git-foo/addressbook/backends/file/e-book-backend-file-index.c
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ git-foo/addressbook/backends/file/e-book-backend-file-index.c	2008-05-07 16:23:36.000000000 +0100
@@ -0,0 +1,871 @@
+/*
+ * Copyright (C) 2008 OpenedHand Ltd
+ *

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