diff options
| -rw-r--r-- | addressbook/ChangeLog | 12 | ||||
| -rw-r--r-- | addressbook/gui/component/Makefile.am | 2 | ||||
| -rw-r--r-- | addressbook/gui/component/addressbook-factory.c | 2 | ||||
| -rw-r--r-- | addressbook/gui/component/addressbook.c | 2 | ||||
| -rw-r--r-- | addressbook/gui/search/e-addressbook-search-dialog.c | 3 | ||||
| -rw-r--r-- | addressbook/gui/widgets/e-minicard-view.h | 2 | ||||
| -rw-r--r-- | widgets/ChangeLog | 4 | ||||
| -rw-r--r-- | widgets/e-reflow/e-reflow-sorted.h | 2 |
8 files changed, 23 insertions, 6 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index a2bcace3dc..297a41a8e0 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,15 @@ +2000-09-14 Michael Meeks <michael@helixcode.com> + + * gui/component/Makefile.am (evolution_addressbook_LDADD): fix path. + + * gui/component/addressbook.c: update include. + + * gui/component/addressbook-factory.c: update include. + + * gui/widgets/e-minicard-view.h: update include. + + * gui/search/e-addressbook-search-dialog.c: update include path. + 2000-09-13 Michael Meeks <michael@helixcode.com> * contact-editor/e-contact-editor.c (e_contact_editor_init): hack. diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am index f420c6dc5d..b3b644b561 100644 --- a/addressbook/gui/component/Makefile.am +++ b/addressbook/gui/component/Makefile.am @@ -48,7 +48,7 @@ evolution_addressbook_LDADD = \ $(top_builddir)/shell/libeshell.a \ $(EXTRA_GNOME_LIBS) \ $(BONOBO_HTML_GNOME_LIBS) \ - $(top_builddir)/addressbook/gui/minicard/libeminicard.a \ + $(top_builddir)/addressbook/gui/widgets/libeminicard.a \ $(top_builddir)/addressbook/backend/ebook/libebook.la \ $(top_builddir)/addressbook/ename/libename.la \ $(top_builddir)/addressbook/contact-editor/libecontacteditor.a \ diff --git a/addressbook/gui/component/addressbook-factory.c b/addressbook/gui/component/addressbook-factory.c index 9ee420e851..78d9a66d1d 100644 --- a/addressbook/gui/component/addressbook-factory.c +++ b/addressbook/gui/component/addressbook-factory.c @@ -17,7 +17,7 @@ #include "addressbook.h" #include "addressbook-component.h" -#include "addressbook/gui/minicard/e-minicard-control.h" +#include "addressbook/gui/widgets/e-minicard-control.h" #include "select-names/e-select-names-factory.h" diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c index e7cc317c8e..9ee83d110f 100644 --- a/addressbook/gui/component/addressbook.c +++ b/addressbook/gui/component/addressbook.c @@ -20,7 +20,7 @@ #include <e-util/e-util.h> #include <e-util/e-popup-menu.h> #include <e-util/e-unicode.h> -#include "e-minicard-view-widget.h" +#include "addressbook/gui/widgets/e-minicard-view-widget.h" #include "addressbook/gui/search/e-addressbook-search-dialog.h" #include <e-table.h> diff --git a/addressbook/gui/search/e-addressbook-search-dialog.c b/addressbook/gui/search/e-addressbook-search-dialog.c index ed324ba9c4..6c71945886 100644 --- a/addressbook/gui/search/e-addressbook-search-dialog.c +++ b/addressbook/gui/search/e-addressbook-search-dialog.c @@ -24,8 +24,9 @@ #include <gnome.h> #include <e-util/e-canvas.h> #include "e-addressbook-search-dialog.h" -#include "addressbook/gui/minicard/e-minicard-view-widget.h" +#include "addressbook/gui/widgets/e-minicard-view-widget.h" #include "widgets/misc/e-scroll-frame.h" + static void e_addressbook_search_dialog_init (EAddressbookSearchDialog *widget); static void e_addressbook_search_dialog_class_init (EAddressbookSearchDialogClass *klass); static void e_addressbook_search_dialog_set_arg (GtkObject *o, GtkArg *arg, guint arg_id); diff --git a/addressbook/gui/widgets/e-minicard-view.h b/addressbook/gui/widgets/e-minicard-view.h index a166a6ade1..a938019787 100644 --- a/addressbook/gui/widgets/e-minicard-view.h +++ b/addressbook/gui/widgets/e-minicard-view.h @@ -22,7 +22,7 @@ #define __E_MINICARD_VIEW_H__ #include <gnome.h> -#include "e-reflow-sorted.h" +#include <widgets/e-reflow/e-reflow-sorted.h> #include <ebook/e-book.h> #ifdef __cplusplus diff --git a/widgets/ChangeLog b/widgets/ChangeLog index 59be09395e..69e9ecdee1 100644 --- a/widgets/ChangeLog +++ b/widgets/ChangeLog @@ -1,3 +1,7 @@ +2000-09-14 Michael Meeks <michael@helixcode.com> + + * e-reflow/e-reflow-sorted.h: fix include. + 2000-09-13 Christopher James Lahey <clahey@helixcode.com> * Makefile.am (SUBDIRS): Added e-reflow. diff --git a/widgets/e-reflow/e-reflow-sorted.h b/widgets/e-reflow/e-reflow-sorted.h index 1be4971fb2..feafdbac16 100644 --- a/widgets/e-reflow/e-reflow-sorted.h +++ b/widgets/e-reflow/e-reflow-sorted.h @@ -21,7 +21,7 @@ #ifndef __E_REFLOW_SORTED_H__ #define __E_REFLOW_SORTED_H__ -#include <addressbook/gui/minicard/e-reflow.h> +#include "e-reflow.h" #ifdef __cplusplus extern "C" { |