diff options
| -rw-r--r-- | addressbook/gui/Makefile.am | 2 | ||||
| -rw-r--r-- | addressbook/gui/contact-list-editor/e-contact-list-editor.h | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/addressbook/gui/Makefile.am b/addressbook/gui/Makefile.am index 01771f33e4..4e049a7116 100644 --- a/addressbook/gui/Makefile.am +++ b/addressbook/gui/Makefile.am @@ -1 +1 @@ -SUBDIRS = merging widgets component contact-editor contact-list-editor search +SUBDIRS = merging contact-editor contact-list-editor widgets search component diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.h b/addressbook/gui/contact-list-editor/e-contact-list-editor.h index 5a1074321c..9fbda49c5b 100644 --- a/addressbook/gui/contact-list-editor/e-contact-list-editor.h +++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.h @@ -31,7 +31,6 @@ #include <libebook/e-book-async.h> #include <libebook/e-contact.h> #include "addressbook/util/e-destination.h" -#include "addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.h" G_BEGIN_DECLS @@ -75,7 +74,13 @@ struct _EContactListEditor GtkWidget *ok_button; GtkWidget *cancel_button; - GNOME_Evolution_Addressbook_SelectNames corba_select_names; + /* FIXME: Unfortunately, we can't use the proper name here, as it'd + * create a circular dependency. The long-term solution would be to + * move the select-names component out of the component/ dir so it can + * be built before sources using this. + * + * GNOME_Evolution_Addressbook_SelectNames corba_select_names; */ + gpointer corba_select_names; /* Whether we are editing a new contact or an existing one */ guint is_new_list : 1; |