 +  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/Makefile.am
===================================================================
--- git-foo.orig/addressbook/backends/file/Makefile.am	2008-05-06 12:34:14.000000000 +0100
+++ git-foo/addressbook/backends/file/Makefile.am	2008-05-06 12:34:14.000000000 +0100
@@ -12,6 +12,8 @@
 libebookbackendfile_la_SOURCES =			\
 	e-book-backend-file.c				\

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 17:57:01.000000000 +0100
@@ -0,0 +1,863 @@
+/*
+ * Copyright (C) 2008 OpenedHand Ltd
+ *
