diff options
Diffstat (limited to 'addressbook/contact-editor')
7 files changed, 14 insertions, 14 deletions
diff --git a/addressbook/contact-editor/Makefile.am b/addressbook/contact-editor/Makefile.am index bdf16bde6a..64fc447da4 100644 --- a/addressbook/contact-editor/Makefile.am +++ b/addressbook/contact-editor/Makefile.am @@ -5,6 +5,7 @@ CPPFLAGS = \ INCLUDES = \ $(BONOBO_GNOME_CFLAGS) \ + $(EXTRA_GNOME_CFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/addressbook/ \ -I$(top_srcdir)/addressbook/backend \ @@ -41,10 +42,8 @@ contact_editor_test_LDADD = \ $(top_builddir)/libversit/libversit.la \ $(GNOMEGNORBA_LIBS) \ $(BONOBO_GNOME_LIBS) \ - $(top_builddir)/widgets/e-table/libetable.a \ $(top_builddir)/widgets/misc/libemiscwidgets.a \ $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/widgets/e-text/libetext.a \ $(GNOME_PRINT_LIBS) \ $(EXTRA_GNOME_LIBS) diff --git a/addressbook/contact-editor/e-contact-editor-address.c b/addressbook/contact-editor/e-contact-editor-address.c index cf6cc382cd..10160facae 100644 --- a/addressbook/contact-editor/e-contact-editor-address.c +++ b/addressbook/contact-editor/e-contact-editor-address.c @@ -22,7 +22,7 @@ #include <config.h> #include <gnome.h> -#include <e-util/e-unicode.h> +#include <gal/widgets/e-unicode.h> #include <e-contact-editor-address.h> static void e_contact_editor_address_init (EContactEditorAddress *card); diff --git a/addressbook/contact-editor/e-contact-editor-categories.c b/addressbook/contact-editor/e-contact-editor-categories.c index f48100ae9f..1845fc65ff 100644 --- a/addressbook/contact-editor/e-contact-editor-categories.c +++ b/addressbook/contact-editor/e-contact-editor-categories.c @@ -23,12 +23,12 @@ #include <config.h> #include <gnome.h> #include <e-contact-editor-categories.h> -#include <e-table-scrolled.h> -#include <e-table.h> -#include <e-table-simple.h> -#include <e-cell-text.h> -#include <e-cell-checkbox.h> -#include <e-util/e-unicode.h> +#include <gal/e-table/e-table-scrolled.h> +#include <gal/e-table/e-table.h> +#include <gal/e-table/e-table-simple.h> +#include <gal/e-table/e-cell-text.h> +#include <gal/e-table/e-cell-checkbox.h> +#include <gal/widgets/e-unicode.h> static void e_contact_editor_categories_init (EContactEditorCategories *card); static void e_contact_editor_categories_class_init (EContactEditorCategoriesClass *klass); diff --git a/addressbook/contact-editor/e-contact-editor-categories.h b/addressbook/contact-editor/e-contact-editor-categories.h index 529ef71b68..3edff76b4b 100644 --- a/addressbook/contact-editor/e-contact-editor-categories.h +++ b/addressbook/contact-editor/e-contact-editor-categories.h @@ -24,7 +24,7 @@ #include <gnome.h> #include <glade/glade.h> #include <ebook/e-card.h> -#include <widgets/e-table/e-table-model.h> +#include <gal/e-table/e-table-model.h> #ifdef __cplusplus extern "C" { diff --git a/addressbook/contact-editor/e-contact-editor-fullname.c b/addressbook/contact-editor/e-contact-editor-fullname.c index d3f8f399bb..79f458aa22 100644 --- a/addressbook/contact-editor/e-contact-editor-fullname.c +++ b/addressbook/contact-editor/e-contact-editor-fullname.c @@ -22,7 +22,7 @@ #include <config.h> #include <gnome.h> -#include <e-util/e-unicode.h> +#include <gal/widgets/e-unicode.h> #include <e-contact-editor-fullname.h> static void e_contact_editor_fullname_init (EContactEditorFullname *card); diff --git a/addressbook/contact-editor/e-contact-editor.c b/addressbook/contact-editor/e-contact-editor.c index 4d147def56..6dd00aa273 100644 --- a/addressbook/contact-editor/e-contact-editor.c +++ b/addressbook/contact-editor/e-contact-editor.c @@ -28,8 +28,9 @@ #include <e-contact-editor-categories.h> #include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gnome-canvas-pixbuf.h> -#include <e-util/e-gui-utils.h> -#include <e-util/e-unicode.h> +#include "e-util/e-gui-utils.h" +#include <gal/widgets/e-gui-utils.h> +#include <gal/widgets/e-unicode.h> #include <e-contact-save-as.h> #include "addressbook/printing/e-contact-print.h" diff --git a/addressbook/contact-editor/e-contact-save-as.c b/addressbook/contact-editor/e-contact-save-as.c index 51cb2619e7..7209c5e8f8 100644 --- a/addressbook/contact-editor/e-contact-save-as.c +++ b/addressbook/contact-editor/e-contact-save-as.c @@ -20,7 +20,7 @@ */ #include <e-contact-save-as.h> -#include <e-util/e-util.h> +#include <gal/util/e-util.h> #include <unistd.h> #include <fcntl.h> |