mutt-query (1/3): moved muttq_print_item() from abook.c to filter.c

[pkg/abook.git] / database.h

diff --git a/database.h b/database.h
index 0660992c3f0d71414f0f8788bcb497064499c605..4d33ff478179f0886f2b09571881c6119752ce42 100644 (file)
--- a/database.h
+++ b/database.h
@@ -23,6 +23,7 @@ enum {
        URL,
        NOTES,
        ANNIVERSARY,
+       GROUPS,
        ITEM_FIELDS /* this is the last */
 };
 
@@ -43,7 +44,7 @@ enum {
        FIELD_STRING = 1,
        FIELD_EMAILS,
        FIELD_LIST,
-       FIELD_DAY,
+       FIELD_DATE,
 };
 
 enum {
@@ -66,7 +67,7 @@ abook_field *real_find_field(char *key, abook_field_list *list, int *nb);
 #define find_field(key, list)          real_find_field(key, list, NULL)
 #define find_field_number(key, pt_nb)  real_find_field(key, NULL, pt_nb)
 #define find_declared_field(key)       find_field(key,NULL)
-void get_field_keyname(int i, char **key, char **name);
+void get_field_info(int i, char **key, char **name, int *type);
 void add_field(abook_field_list **list, abook_field *f);
 char *declare_new_field(char *key, char *name, char *type, int accept_standard);
 void init_standard_fields();
@@ -80,6 +81,8 @@ int load_database(char *filename);
 int write_database(FILE *out, struct db_enumerator e);
 int save_database();
 void remove_selected_items();
+void merge_selected_items();
+void remove_duplicates();
 void sort_surname();
 void sort_by_field(char *field);
 void close_database();
@@ -104,6 +107,7 @@ void item_empty(list_item item);
 void item_free(list_item *item);
 void item_copy(list_item dest, list_item src);
 void item_duplicate(list_item dest, list_item src);
+void item_merge(list_item dest, list_item src);
 
 int item_fput(list_item item, int i, char *val);
 char *item_fget(list_item item, int i);