Bug #224687 - Various fixes in contact list editor

- fixed order of buttons in duplicate adding confirmation dialog
- in the editor, don't display email addresses in sublist nodes
- automatically remove sublists with no children

1 files changed, 2 insertions, 1 deletions

diff --git a/addressbook/gui/contact-list-editor/e-contact-list-model.h b/addressbook/gui/contact-list-editor/e-contact-list-model.h
index b902658365..91e8a82cdb 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-model.h
+++ b/addressbook/gui/contact-list-editor/e-contact-list-model.h
@@ -69,7 +69,8 @@ gboolean	e_contact_list_model_has_uid	(EContactListModel *model,
 GtkTreePath *	e_contact_list_model_add_destination
 						(EContactListModel *model,
 						 EDestination *dest,
-						 GtkTreeIter *parent);
+						 GtkTreeIter *parent,
+						 gboolean ignore_conflicts);
 void		e_contact_list_model_add_contact (EContactListModel *model,
 						 EContact *contact,
 						 gint email_num);