aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
authorFederico Mena Quintero <federico@helixcode.com>2000-04-21 07:18:51 +0800
committerFederico Mena Quintero <federico@src.gnome.org>2000-04-21 07:18:51 +0800
commita2ee0e2ec91ae9dec0bd10cbc716651dfdf0932a (patch)
tree4aadfc1ee70b6d886decf95820964183181c215c /addressbook
parente38b6187f5dbe154e07ec7b2d5fb036df0597265 (diff)
downloadgsoc2013-evolution-a2ee0e2ec91ae9dec0bd10cbc716651dfdf0932a.tar.gz
gsoc2013-evolution-a2ee0e2ec91ae9dec0bd10cbc716651dfdf0932a.tar.zst
gsoc2013-evolution-a2ee0e2ec91ae9dec0bd10cbc716651dfdf0932a.zip
Use "e-minicard" as the log domain.
2000-04-18 Federico Mena Quintero <federico@helixcode.com> * gui/minicard/Makefile.am (INCLUDES): Use "e-minicard" as the log domain. * gui/component/Makefile.am (INCLUDES): Use "evolution-addressbook" as the log domain. * backend/pas/Makefile.am: Build libpas.a, not a shared library. Do not install any header files. (INCLUDES): Remove spurious include paths. * backend/pas/*.[ch]: Fix includes. * backend/ebook/Makefile.am: Do not install the test programs. Fixed some include weirdness. * backend/ebook/*.[ch]: Fix includes. * contact-editor/Makefile.am (INCLUDES): Set the log domain to "contact-editor". (INCLUDES): Fix. * contact-editor/*.[ch]: Fix includes. * gui/minicard/*.[ch]: Fix includes. svn path=/trunk/; revision=2529
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/ChangeLog27
-rw-r--r--addressbook/backend/ebook/Makefile.am12
-rw-r--r--addressbook/backend/ebook/e-book-listener.c3
-rw-r--r--addressbook/backend/ebook/e-book-listener.h4
-rw-r--r--addressbook/backend/ebook/e-book-view-listener.c7
-rw-r--r--addressbook/backend/ebook/e-book-view-listener.h2
-rw-r--r--addressbook/backend/ebook/e-book-view.c9
-rw-r--r--addressbook/backend/ebook/e-book-view.h4
-rw-r--r--addressbook/backend/ebook/e-book.c9
-rw-r--r--addressbook/backend/ebook/e-book.h8
-rw-r--r--addressbook/backend/ebook/e-card-cursor.h4
-rw-r--r--addressbook/backend/ebook/e-card-iterator.c2
-rw-r--r--addressbook/backend/ebook/e-card-list-iterator.c4
-rw-r--r--addressbook/backend/ebook/e-card-list-iterator.h4
-rw-r--r--addressbook/backend/ebook/e-card-list.c4
-rw-r--r--addressbook/backend/ebook/e-card-list.h2
-rw-r--r--addressbook/backend/ebook/e-card-pairs.h4
-rw-r--r--addressbook/backend/ebook/e-card.c6
-rw-r--r--addressbook/backend/ebook/e-card.h4
-rw-r--r--addressbook/backend/ebook/test-card.c2
-rw-r--r--addressbook/backend/ebook/test-client-list.c2
-rw-r--r--addressbook/backend/pas/Makefile.am41
-rw-r--r--addressbook/backend/pas/pas-backend-file.c10
-rw-r--r--addressbook/backend/pas/pas-backend-file.h2
-rw-r--r--addressbook/backend/pas/pas-backend-ldap.c4
-rw-r--r--addressbook/backend/pas/pas-backend-ldap.h2
-rw-r--r--addressbook/backend/pas/pas-backend.c3
-rw-r--r--addressbook/backend/pas/pas-backend.h4
-rw-r--r--addressbook/backend/pas/pas-book-factory.c5
-rw-r--r--addressbook/backend/pas/pas-book-factory.h2
-rw-r--r--addressbook/backend/pas/pas-book-view.c1
-rw-r--r--addressbook/backend/pas/pas-book-view.h2
-rw-r--r--addressbook/backend/pas/pas-book.c3
-rw-r--r--addressbook/backend/pas/pas-book.h8
-rw-r--r--addressbook/backend/pas/pas-card-cursor.h2
-rw-r--r--addressbook/contact-editor/Makefile.am27
-rw-r--r--addressbook/contact-editor/e-contact-editor.c2
-rw-r--r--addressbook/contact-editor/e-contact-editor.h2
-rw-r--r--addressbook/gui/component/Makefile.am29
-rw-r--r--addressbook/gui/component/addressbook.c4
-rw-r--r--addressbook/gui/contact-editor/Makefile.am27
-rw-r--r--addressbook/gui/contact-editor/e-contact-editor.c2
-rw-r--r--addressbook/gui/contact-editor/e-contact-editor.h2
-rw-r--r--addressbook/gui/minicard/Makefile.am77
-rw-r--r--addressbook/gui/minicard/e-minicard-label.c8
-rw-r--r--addressbook/gui/minicard/e-minicard-view.c2
-rw-r--r--addressbook/gui/minicard/e-minicard-view.h2
-rw-r--r--addressbook/gui/minicard/e-minicard.c10
-rw-r--r--addressbook/gui/minicard/e-minicard.h2
-rw-r--r--addressbook/gui/minicard/e-reflow-sorted.c11
-rw-r--r--addressbook/gui/minicard/e-reflow.c8
-rw-r--r--addressbook/gui/minicard/test-minicard-label.c2
-rw-r--r--addressbook/gui/minicard/test-minicard-view.c2
-rw-r--r--addressbook/gui/minicard/test-reflow.c2
-rw-r--r--addressbook/gui/widgets/Makefile.am77
-rw-r--r--addressbook/gui/widgets/e-minicard-label.c8
-rw-r--r--addressbook/gui/widgets/e-minicard-view.c2
-rw-r--r--addressbook/gui/widgets/e-minicard-view.h2
-rw-r--r--addressbook/gui/widgets/e-minicard.c10
-rw-r--r--addressbook/gui/widgets/e-minicard.h2
-rw-r--r--addressbook/gui/widgets/test-minicard-label.c2
-rw-r--r--addressbook/gui/widgets/test-minicard-view.c2
-rw-r--r--addressbook/gui/widgets/test-reflow.c2
63 files changed, 287 insertions, 253 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 833e23cc7b..f0bd6f790f 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,28 @@
-2000-04-17 Federico Mena Quintero <federico@helixcode.com>
+2000-04-18 Federico Mena Quintero <federico@helixcode.com>
+
+ * gui/minicard/Makefile.am (INCLUDES): Use "e-minicard" as the log
+ domain.
+
+ * gui/component/Makefile.am (INCLUDES): Use
+ "evolution-addressbook" as the log domain.
+
+ * backend/pas/Makefile.am: Build libpas.a, not a shared library.
+ Do not install any header files.
+ (INCLUDES): Remove spurious include paths.
+
+ * backend/pas/*.[ch]: Fix includes.
+
+ * backend/ebook/Makefile.am: Do not install the test programs.
+ Fixed some include weirdness.
+
+ * backend/ebook/*.[ch]: Fix includes.
+
+ * contact-editor/Makefile.am (INCLUDES): Set the log domain to
+ "contact-editor".
+ (INCLUDES): Fix.
+
+ * contact-editor/*.[ch]: Fix includes.
+
+ * gui/minicard/*.[ch]: Fix includes.
* ChangeLog: Started a ChangeLog here.
diff --git a/addressbook/backend/ebook/Makefile.am b/addressbook/backend/ebook/Makefile.am
index bbff2d7f42..fb064888cd 100644
--- a/addressbook/backend/ebook/Makefile.am
+++ b/addressbook/backend/ebook/Makefile.am
@@ -1,4 +1,4 @@
-bin_PROGRAMS = test-card test-client test-client-list
+noinst_PROGRAMS = test-card test-client test-client-list
corbadir = $(sysconfdir)/CORBA/servers
@@ -19,11 +19,9 @@ $(CORBA_SOURCE): $(idls)
INCLUDES = \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-DG_LOG_DOMAIN=\"EBook\" \
- -I$(builddir) \
- -I$(srcdir) -I$(top_srcdir) \
- -I$(srcdir)/. \
- -I$(srcdir)/.. \
- -I$(includedir) \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/addressbook/backend \
+ -I$(top_builddir)/addressbook/backend \
$(GNOME_INCLUDEDIR)
gnome_libs = \
@@ -50,7 +48,7 @@ libebook_la_SOURCES = \
e-card-list.c \
e-card.c
-libebookincludedir = $(includedir)/backend
+libebookincludedir = $(includedir)/evolution/ebook
libebookinclude_HEADERS = \
e-book-listener.h \
diff --git a/addressbook/backend/ebook/e-book-listener.c b/addressbook/backend/ebook/e-book-listener.c
index d58242dd30..d0ccc46944 100644
--- a/addressbook/backend/ebook/e-book-listener.c
+++ b/addressbook/backend/ebook/e-book-listener.c
@@ -9,8 +9,9 @@
* Copyright 2000, Helix Code, Inc.
*/
+#include <config.h>
#include <gtk/gtksignal.h>
-#include <e-book-listener.h>
+#include "e-book-listener.h"
static EBookStatus e_book_listener_convert_status (Evolution_BookListener_CallStatus status);
diff --git a/addressbook/backend/ebook/e-book-listener.h b/addressbook/backend/ebook/e-book-listener.h
index 5707deceb5..eb0432e360 100644
--- a/addressbook/backend/ebook/e-book-listener.h
+++ b/addressbook/backend/ebook/e-book-listener.h
@@ -14,8 +14,8 @@
#include <libgnome/gnome-defs.h>
#include <bonobo/bonobo-object.h>
-#include <addressbook.h>
-#include <e-book-types.h>
+#include <ebook/addressbook.h>
+#include <ebook/e-book-types.h>
BEGIN_GNOME_DECLS
diff --git a/addressbook/backend/ebook/e-book-view-listener.c b/addressbook/backend/ebook/e-book-view-listener.c
index 0185f7817d..c84bf160c5 100644
--- a/addressbook/backend/ebook/e-book-view-listener.c
+++ b/addressbook/backend/ebook/e-book-view-listener.c
@@ -9,10 +9,11 @@
* Copyright 2000, Helix Code, Inc.
*/
+#include <config.h>
#include <gtk/gtksignal.h>
-#include <e-book-view-listener.h>
-#include <e-book-view.h>
-#include <e-card.h>
+#include "e-book-view-listener.h"
+#include "e-book-view.h"
+#include "e-card.h"
enum {
RESPONSES_QUEUED,
diff --git a/addressbook/backend/ebook/e-book-view-listener.h b/addressbook/backend/ebook/e-book-view-listener.h
index 65d20a3489..85542217df 100644
--- a/addressbook/backend/ebook/e-book-view-listener.h
+++ b/addressbook/backend/ebook/e-book-view-listener.h
@@ -14,7 +14,7 @@
#include <libgnome/gnome-defs.h>
#include <bonobo/bonobo-object.h>
-#include <addressbook.h>
+#include <ebook/addressbook.h>
BEGIN_GNOME_DECLS
diff --git a/addressbook/backend/ebook/e-book-view.c b/addressbook/backend/ebook/e-book-view.c
index a0626ed0a2..db7e1b9e67 100644
--- a/addressbook/backend/ebook/e-book-view.c
+++ b/addressbook/backend/ebook/e-book-view.c
@@ -8,13 +8,14 @@
* Copyright 1999, 2000, Helix Code, Inc.
*/
-#include <addressbook.h>
+#include <config.h>
#include <libgnorba/gnorba.h>
#include <gtk/gtksignal.h>
#include <gtk/gtkmarshal.h>
-#include <e-card-cursor.h>
-#include <e-book-view-listener.h>
-#include <e-book-view.h>
+#include "addressbook.h"
+#include "e-card-cursor.h"
+#include "e-book-view-listener.h"
+#include "e-book-view.h"
GtkObjectClass *e_book_view_parent_class;
diff --git a/addressbook/backend/ebook/e-book-view.h b/addressbook/backend/ebook/e-book-view.h
index a286e50665..5ae20e1521 100644
--- a/addressbook/backend/ebook/e-book-view.h
+++ b/addressbook/backend/ebook/e-book-view.h
@@ -13,8 +13,8 @@
#include <libgnome/gnome-defs.h>
-#include <e-card.h>
-#include <e-book-view-listener.h>
+#include <ebook/e-card.h>
+#include <ebook/e-book-view-listener.h>
BEGIN_GNOME_DECLS
diff --git a/addressbook/backend/ebook/e-book.c b/addressbook/backend/ebook/e-book.c
index 5cdbb4fbb2..1b6411ae0a 100644
--- a/addressbook/backend/ebook/e-book.c
+++ b/addressbook/backend/ebook/e-book.c
@@ -8,13 +8,14 @@
* Copyright 1999, 2000, Helix Code, Inc.
*/
-#include <addressbook.h>
+#include <config.h>
#include <libgnorba/gnorba.h>
#include <gtk/gtksignal.h>
#include <gtk/gtkmarshal.h>
-#include <e-card-cursor.h>
-#include <e-book-listener.h>
-#include <e-book.h>
+#include "addressbook.h"
+#include "e-card-cursor.h"
+#include "e-book-listener.h"
+#include "e-book.h"
GtkObjectClass *e_book_parent_class;
diff --git a/addressbook/backend/ebook/e-book.h b/addressbook/backend/ebook/e-book.h
index f45fd1cd1d..4cab606239 100644
--- a/addressbook/backend/ebook/e-book.h
+++ b/addressbook/backend/ebook/e-book.h
@@ -13,10 +13,10 @@
#include <libgnome/gnome-defs.h>
-#include <e-card.h>
-#include <e-card-cursor.h>
-#include <e-book-view.h>
-#include <e-book-types.h>
+#include <ebook/e-card.h>
+#include <ebook/e-card-cursor.h>
+#include <ebook/e-book-view.h>
+#include <ebook/e-book-types.h>
BEGIN_GNOME_DECLS
diff --git a/addressbook/backend/ebook/e-card-cursor.h b/addressbook/backend/ebook/e-card-cursor.h
index 7cb3a1d28c..67020071d1 100644
--- a/addressbook/backend/ebook/e-card-cursor.h
+++ b/addressbook/backend/ebook/e-card-cursor.h
@@ -12,8 +12,8 @@
#include <libgnome/gnome-defs.h>
#include <gtk/gtk.h>
-#include "addressbook/backend/ebook/addressbook.h"
-#include "e-card.h"
+#include <ebook/addressbook.h>
+#include <ebook/e-card.h>
BEGIN_GNOME_DECLS
diff --git a/addressbook/backend/ebook/e-card-iterator.c b/addressbook/backend/ebook/e-card-iterator.c
index 0d666e649f..b5a023b5c1 100644
--- a/addressbook/backend/ebook/e-card-iterator.c
+++ b/addressbook/backend/ebook/e-card-iterator.c
@@ -10,7 +10,7 @@
#include <config.h>
#include <gtk/gtk.h>
-#include <e-card-iterator.h>
+#include "e-card-iterator.h"
#define ECI_CLASS(object) (E_CARD_ITERATOR_CLASS(GTK_OBJECT((object))->klass))
diff --git a/addressbook/backend/ebook/e-card-list-iterator.c b/addressbook/backend/ebook/e-card-list-iterator.c
index e3426ddc3b..d23060fda2 100644
--- a/addressbook/backend/ebook/e-card-list-iterator.c
+++ b/addressbook/backend/ebook/e-card-list-iterator.c
@@ -10,8 +10,8 @@
#include <config.h>
#include <gtk/gtk.h>
-#include <e-card-list-iterator.h>
-#include <e-card-list.h>
+#include "e-card-list-iterator.h"
+#include "e-card-list.h"
static void e_card_list_iterator_init (ECardListIterator *card);
static void e_card_list_iterator_class_init (ECardListIteratorClass *klass);
diff --git a/addressbook/backend/ebook/e-card-list-iterator.h b/addressbook/backend/ebook/e-card-list-iterator.h
index 67d56cfb9c..38a7d77f21 100644
--- a/addressbook/backend/ebook/e-card-list-iterator.h
+++ b/addressbook/backend/ebook/e-card-list-iterator.h
@@ -13,8 +13,8 @@
#include <time.h>
#include <gtk/gtk.h>
#include <stdio.h>
-#include <e-card-iterator.h>
-#include <e-card-list.h>
+#include <ebook/e-card-iterator.h>
+#include <ebook/e-card-list.h>
#define E_TYPE_CARD_LIST_ITERATOR (e_card_list_iterator_get_type ())
#define E_CARD_LIST_ITERATOR(obj) (GTK_CHECK_CAST ((obj), E_TYPE_CARD_LIST_ITERATOR, ECardListIterator))
diff --git a/addressbook/backend/ebook/e-card-list.c b/addressbook/backend/ebook/e-card-list.c
index d4965b77d5..9bec3b7bd5 100644
--- a/addressbook/backend/ebook/e-card-list.c
+++ b/addressbook/backend/ebook/e-card-list.c
@@ -10,8 +10,8 @@
#include <config.h>
#include <gtk/gtk.h>
-#include <e-card-list.h>
-#include <e-card-list-iterator.h>
+#include "e-card-list.h"
+#include "e-card-list-iterator.h"
#define ECL_CLASS(object) (E_CARD_LIST_CLASS(GTK_OBJECT((object))->klass))
diff --git a/addressbook/backend/ebook/e-card-list.h b/addressbook/backend/ebook/e-card-list.h
index 7ceeef1993..18b69b2a3e 100644
--- a/addressbook/backend/ebook/e-card-list.h
+++ b/addressbook/backend/ebook/e-card-list.h
@@ -13,7 +13,7 @@
#include <time.h>
#include <gtk/gtk.h>
#include <stdio.h>
-#include <e-card-iterator.h>
+#include <ebook/e-card-iterator.h>
#define E_TYPE_CARD_LIST (e_card_list_get_type ())
#define E_CARD_LIST(obj) (GTK_CHECK_CAST ((obj), E_TYPE_CARD_LIST, ECardList))
diff --git a/addressbook/backend/ebook/e-card-pairs.h b/addressbook/backend/ebook/e-card-pairs.h
index 2c7635b8a4..0f379d3477 100644
--- a/addressbook/backend/ebook/e-card-pairs.h
+++ b/addressbook/backend/ebook/e-card-pairs.h
@@ -23,8 +23,8 @@
#ifndef __E_CARD_PAIRS_H__
#define __E_CARD_PAIRS_H__
-#include "libversit/vcc.h"
-#include <e-card.h>
+#include <libversit/vcc.h>
+#include <ebook/e-card.h>
#if 0
diff --git a/addressbook/backend/ebook/e-card.c b/addressbook/backend/ebook/e-card.c
index 180b5308fc..683c4add13 100644
--- a/addressbook/backend/ebook/e-card.c
+++ b/addressbook/backend/ebook/e-card.c
@@ -14,9 +14,9 @@
#include <string.h>
#include <gtk/gtk.h>
-#include "libversit/vcc.h"
-#include <e-card.h>
-#include <e-card-pairs.h>
+#include <libversit/vcc.h>
+#include "e-card.h"
+#include "e-card-pairs.h"
#define is_a_prop_of(obj,prop) (isAPropertyOf ((obj),(prop)))
#define str_val(obj) (the_str = (vObjectValueType (obj))? fakeCString (vObjectUStringZValue (obj)) : calloc (1, 1))
diff --git a/addressbook/backend/ebook/e-card.h b/addressbook/backend/ebook/e-card.h
index 15a5ca74c7..b10585c4a8 100644
--- a/addressbook/backend/ebook/e-card.h
+++ b/addressbook/backend/ebook/e-card.h
@@ -15,8 +15,8 @@
#include <time.h>
#include <gtk/gtk.h>
#include <stdio.h>
-#include <e-card-types.h>
-#include <e-card-list.h>
+#include <ebook/e-card-types.h>
+#include <ebook/e-card-list.h>
#define E_TYPE_CARD (e_card_get_type ())
#define E_CARD(obj) (GTK_CHECK_CAST ((obj), E_TYPE_CARD, ECard))
diff --git a/addressbook/backend/ebook/test-card.c b/addressbook/backend/ebook/test-card.c
index a60569548b..c6ee6e9ff1 100644
--- a/addressbook/backend/ebook/test-card.c
+++ b/addressbook/backend/ebook/test-card.c
@@ -1,5 +1,5 @@
#include <gnome.h>
-#include <e-card.h>
+#include "e-card.h"
#define TEST_VCARD \
"BEGIN:VCARD
diff --git a/addressbook/backend/ebook/test-client-list.c b/addressbook/backend/ebook/test-client-list.c
index 0679aec2fe..eaa6e41c94 100644
--- a/addressbook/backend/ebook/test-client-list.c
+++ b/addressbook/backend/ebook/test-client-list.c
@@ -4,7 +4,7 @@
#include <gnome.h>
#include <libgnorba/gnorba.h>
-#include <e-book.h>
+#include "e-book.h"
CORBA_Environment ev;
CORBA_ORB orb;
diff --git a/addressbook/backend/pas/Makefile.am b/addressbook/backend/pas/Makefile.am
index c5f8ed302a..44cb5a66a1 100644
--- a/addressbook/backend/pas/Makefile.am
+++ b/addressbook/backend/pas/Makefile.am
@@ -1,7 +1,3 @@
-lib_LTLIBRARIES = libpas.la
-
-corbadir = $(sysconfdir)/CORBA/servers
-
CORBA_SOURCE = \
addressbook.h \
addressbook-common.c \
@@ -18,45 +14,32 @@ $(CORBA_SOURCE): $(idls)
INCLUDES = \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
- -DG_LOG_DOMAIN=\"Wombat\" \
- -I$(builddir) \
- -I$(srcdir) -I$(top_srcdir) \
- -I$(srcdir)/. \
- -I$(srcdir)/.. \
- -I$(top_builddir) \
- -I$(includedir) \
- -I$(top_srcdir)/e-util \
- -I$(top_srcdir)/addressbook/backend/ebook \
+ -DG_LOG_DOMAIN=\"wombat-pas\" \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/addressbook/backend \
+ -I$(top_builddir)/addressbook/backend \
$(GNOME_INCLUDEDIR)
-gnome_libs = \
- $(GNOME_LIBDIR) \
- $(GNOMEUI_LIBS) \
- $(GNOMEGNORBA_LIBS) \
- $(INTLLIBS)
-
if ENABLE_LDAP
LDAP_BACKEND = pas-backend-ldap.c
endif
-libpas_la_SOURCES = \
+noinst_LIBRARIES = libpas.a
+
+libpas_a_SOURCES = \
$(CORBA_SOURCE) \
pas-book-factory.c \
+ pas-book-factory.h \
pas-book-view.c \
+ pas-book-view.h \
pas-book.c \
+ pas-book.h \
pas-backend-file.c \
+ pas-backend-file.h \
$(LDAP_BACKEND) \
pas-backend.c \
- pas-card-cursor.c
-
-libpasincludedir = $(includedir)/backend
-
-libpasinclude_HEADERS = \
- pas-book-factory.h \
- pas-book-view.h \
- pas-book.h \
- pas-backend-file.h \
pas-backend.h \
+ pas-card-cursor.c \
pas-card-cursor.h
BUILT_SOURCES = $(CORBA_SOURCE)
diff --git a/addressbook/backend/pas/pas-backend-file.c b/addressbook/backend/pas/pas-backend-file.c
index 02ad7866b2..a1435f9251 100644
--- a/addressbook/backend/pas/pas-backend-file.c
+++ b/addressbook/backend/pas/pas-backend-file.c
@@ -16,11 +16,11 @@
#include <db.h>
#endif
-#include <pas-backend-file.h>
-#include <pas-book.h>
-#include <pas-card-cursor.h>
-#include <e-card.h>
-#include <e-sexp.h>
+#include "pas-backend-file.h"
+#include "pas-book.h"
+#include "pas-card-cursor.h"
+#include <ebook/e-card.h>
+#include <e-util/e-sexp.h>
#define PAS_BACKEND_FILE_VERSION_NAME "PAS-DB-VERSION"
#define PAS_BACKEND_FILE_VERSION "0.1"
diff --git a/addressbook/backend/pas/pas-backend-file.h b/addressbook/backend/pas/pas-backend-file.h
index a56626014b..4da9a29cc5 100644
--- a/addressbook/backend/pas/pas-backend-file.h
+++ b/addressbook/backend/pas/pas-backend-file.h
@@ -6,7 +6,7 @@
#define __PAS_BACKEND_FILE_H__
#include <libgnome/gnome-defs.h>
-#include <pas-backend.h>
+#include "pas-backend.h"
typedef struct _PASBackendFilePrivate PASBackendFilePrivate;
diff --git a/addressbook/backend/pas/pas-backend-ldap.c b/addressbook/backend/pas/pas-backend-ldap.c
index 9b98a0ce1f..95d80d898d 100644
--- a/addressbook/backend/pas/pas-backend-ldap.c
+++ b/addressbook/backend/pas/pas-backend-ldap.c
@@ -17,8 +17,8 @@
#include "pas-book.h"
#include "pas-card-cursor.h"
-#include <e-sexp.h>
-#include <e-card.h>
+#include <e-util/e-sexp.h>
+#include <ebook/e-card.h>
#define LDAP_MAX_SEARCH_RESPONSES 500
diff --git a/addressbook/backend/pas/pas-backend-ldap.h b/addressbook/backend/pas/pas-backend-ldap.h
index fa6d2295d8..a59cdf3857 100644
--- a/addressbook/backend/pas/pas-backend-ldap.h
+++ b/addressbook/backend/pas/pas-backend-ldap.h
@@ -6,7 +6,7 @@
#define __PAS_BACKEND_LDAP_H__
#include <libgnome/gnome-defs.h>
-#include <pas-backend.h>
+#include "pas-backend.h"
typedef struct _PASBackendLDAPPrivate PASBackendLDAPPrivate;
diff --git a/addressbook/backend/pas/pas-backend.c b/addressbook/backend/pas/pas-backend.c
index 364204c3c2..d8aa23fb37 100644
--- a/addressbook/backend/pas/pas-backend.c
+++ b/addressbook/backend/pas/pas-backend.c
@@ -5,8 +5,9 @@
* Copyright 2000, Helix Code, Inc.
*/
+#include <config.h>
#include <gtk/gtkobject.h>
-#include <pas-backend.h>
+#include "pas-backend.h"
#define CLASS(o) PAS_BACKEND_CLASS (GTK_OBJECT (o)->klass)
diff --git a/addressbook/backend/pas/pas-backend.h b/addressbook/backend/pas/pas-backend.h
index 62822619ac..46cce03e03 100644
--- a/addressbook/backend/pas/pas-backend.h
+++ b/addressbook/backend/pas/pas-backend.h
@@ -23,12 +23,12 @@
#include <libgnome/gnome-defs.h>
#include <gtk/gtkobject.h>
-#include <addressbook.h>
+#include <pas/addressbook.h>
typedef struct _PASBackend PASBackend;
typedef struct _PASBackendPrivate PASBackendPrivate;
-#include <pas-book.h>
+#include <pas/pas-book.h>
struct _PASBackend {
GtkObject parent_object;
diff --git a/addressbook/backend/pas/pas-book-factory.c b/addressbook/backend/pas/pas-book-factory.c
index 576b28b0f5..6542ffc48b 100644
--- a/addressbook/backend/pas/pas-book-factory.c
+++ b/addressbook/backend/pas/pas-book-factory.c
@@ -6,10 +6,11 @@
* Copyright 2000, Helix Code, Inc.
*/
+#include <config.h>
#include <ctype.h>
#include <libgnorba/gnorba.h>
-#include <addressbook.h>
-#include <pas-book-factory.h>
+#include "addressbook.h"
+#include "pas-book-factory.h"
#define PAS_BOOK_FACTORY_GOAD_ID "evolution:addressbook-server"
diff --git a/addressbook/backend/pas/pas-book-factory.h b/addressbook/backend/pas/pas-book-factory.h
index cd99ae0825..c9607298f5 100644
--- a/addressbook/backend/pas/pas-book-factory.h
+++ b/addressbook/backend/pas/pas-book-factory.h
@@ -5,7 +5,7 @@
#include <bonobo/bonobo-object.h>
#include <libgnome/gnome-defs.h>
-#include <pas-backend.h>
+#include <pas/pas-backend.h>
#ifndef __PAS_BOOK_FACTORY_H__
#define __PAS_BOOK_FACTORY_H__
diff --git a/addressbook/backend/pas/pas-book-view.c b/addressbook/backend/pas/pas-book-view.c
index 9754fb5692..d218112555 100644
--- a/addressbook/backend/pas/pas-book-view.c
+++ b/addressbook/backend/pas/pas-book-view.c
@@ -5,6 +5,7 @@
* Copyright 2000, Helix Code, Inc.
*/
+#include <config.h>
#include <glib.h>
#include "pas-book-view.h"
diff --git a/addressbook/backend/pas/pas-book-view.h b/addressbook/backend/pas/pas-book-view.h
index 9644c79de1..55023b48ed 100644
--- a/addressbook/backend/pas/pas-book-view.h
+++ b/addressbook/backend/pas/pas-book-view.h
@@ -14,7 +14,7 @@
#include <bonobo/bonobo-object.h>
#include <libgnome/gnome-defs.h>
-#include <addressbook.h>
+#include <pas/addressbook.h>
typedef struct _PASBookView PASBookView;
typedef struct _PASBookViewClass PASBookViewClass;
diff --git a/addressbook/backend/pas/pas-book.c b/addressbook/backend/pas/pas-book.c
index 47e5508654..8aea0197cc 100644
--- a/addressbook/backend/pas/pas-book.c
+++ b/addressbook/backend/pas/pas-book.c
@@ -5,8 +5,9 @@
* Copyright 2000, Helix Code, Inc.
*/
+#include <config.h>
#include <gtk/gtksignal.h>
-#include <pas-book.h>
+#include "pas-book.h"
static BonoboObjectClass *pas_book_parent_class;
POA_Evolution_Book__vepv pas_book_vepv;
diff --git a/addressbook/backend/pas/pas-book.h b/addressbook/backend/pas/pas-book.h
index 8d92f6a266..094df79857 100644
--- a/addressbook/backend/pas/pas-book.h
+++ b/addressbook/backend/pas/pas-book.h
@@ -14,14 +14,14 @@
#include <bonobo/bonobo-object.h>
#include <libgnome/gnome-defs.h>
-#include <addressbook.h>
-#include <pas-book-view.h>
+#include <pas/addressbook.h>
+#include <pas/pas-book-view.h>
typedef struct _PASBook PASBook;
typedef struct _PASBookPrivate PASBookPrivate;
-#include <pas-backend.h>
-#include <pas-card-cursor.h>
+#include <pas/pas-backend.h>
+#include <pas/pas-card-cursor.h>
typedef enum {
CreateCard,
diff --git a/addressbook/backend/pas/pas-card-cursor.h b/addressbook/backend/pas/pas-card-cursor.h
index a829d2c838..300e3e3ce1 100644
--- a/addressbook/backend/pas/pas-card-cursor.h
+++ b/addressbook/backend/pas/pas-card-cursor.h
@@ -12,7 +12,7 @@
#include <libgnome/gnome-defs.h>
#include <bonobo/bonobo-object.h>
-#include "addressbook.h"
+#include <pas/addressbook.h>
BEGIN_GNOME_DECLS
diff --git a/addressbook/contact-editor/Makefile.am b/addressbook/contact-editor/Makefile.am
index 0e8b924e5e..0a8b3a8489 100644
--- a/addressbook/contact-editor/Makefile.am
+++ b/addressbook/contact-editor/Makefile.am
@@ -1,18 +1,20 @@
imagesdir = $(datadir)/images/evolution
-
images = email.png head.png phone.png snailmail.png web.png arrow.png briefcase.png netmeeting.png netfreebusy.png
EXTRA_DIST = $(images)
pkgdata_DATA = $(images)
-CPPFLAGS = \
- -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
+CPPFLAGS = \
+ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DDATADIR=\""$(datadir)"\"
INCLUDES = \
$(GNOME_INCLUDEDIR) \
- -I$(top_srcdir)/addressbook/backend/ebook \
- -DEVOLUTION_IMAGES=\""$(imagesdir)"\"
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/addressbook/ \
+ -I$(top_srcdir)/addressbook/backend \
+ -DEVOLUTION_IMAGES=\""$(imagesdir)"\" \
+ -DG_LOG_DOMAIN=\"contact-editor\"
noinst_LIBRARIES = \
libecontacteditor.a
@@ -21,23 +23,22 @@ libecontacteditor_a_SOURCES = \
e-contact-editor.c \
e-contact-editor.h
-noinst_PROGRAMS = \
+noinst_PROGRAMS = \
contact-editor-test
contact_editor_test_SOURCES = \
test-editor.c
-contact_editor_test_LDADD = \
+contact_editor_test_LDADD = \
$(top_builddir)/addressbook/backend/ebook/libebook.la \
- $(top_builddir)/libversit/libversit.la \
- $(GNOMEGNORBA_LIBS) \
- -lbonobo \
- $(top_builddir)/e-util/libeutil.la \
- libecontacteditor.a \
+ $(top_builddir)/libversit/libversit.la \
+ $(GNOMEGNORBA_LIBS) \
+ -lbonobo \
+ $(top_builddir)/e-util/libeutil.la \
+ libecontacteditor.a \
$(EXTRA_GNOME_LIBS)
gladedir = $(datadir)/evolution/glade
glade_DATA = \
contact-editor.glade
-
diff --git a/addressbook/contact-editor/e-contact-editor.c b/addressbook/contact-editor/e-contact-editor.c
index 2bb76cebe1..5067b4ff25 100644
--- a/addressbook/contact-editor/e-contact-editor.c
+++ b/addressbook/contact-editor/e-contact-editor.c
@@ -20,8 +20,10 @@
* Boston, MA 02111-1307, USA.
*/
+#include <config.h>
#include <gnome.h>
#include "e-contact-editor.h"
+
static void e_contact_editor_init (EContactEditor *card);
static void e_contact_editor_class_init (EContactEditorClass *klass);
static void e_contact_editor_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
diff --git a/addressbook/contact-editor/e-contact-editor.h b/addressbook/contact-editor/e-contact-editor.h
index 72f87e9b08..82f4a22623 100644
--- a/addressbook/contact-editor/e-contact-editor.h
+++ b/addressbook/contact-editor/e-contact-editor.h
@@ -23,7 +23,7 @@
#include <gnome.h>
#include <glade/glade.h>
-#include "e-card.h"
+#include <ebook/e-card.h>
#ifdef __cplusplus
extern "C" {
diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
index 486cc9d528..c20864912b 100644
--- a/addressbook/gui/component/Makefile.am
+++ b/addressbook/gui/component/Makefile.am
@@ -1,12 +1,13 @@
-INCLUDES = \
- $(EXTRA_GNOME_CFLAGS) \
- $(GNOME_INCLUDEDIR) \
- -I$(top_srcdir)/widgets/e-text \
- -I$(top_srcdir)/e-util \
- -I$(top_srcdir) \
+INCLUDES = \
+ -DG_LOG_DOMAIN=\"evolution-addressbook\" \
+ $(EXTRA_GNOME_CFLAGS) \
+ $(GNOME_INCLUDEDIR) \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/widgets/e-text \
-I$(top_srcdir)/addressbook/gui/minicard \
-I$(top_srcdir)/addressbook/contact-editor \
- -I$(top_srcdir)/addressbook/backend/ebook \
+ -I$(top_srcdir)/addressbook/backend \
+ -I$(top_builddir)/addressbook/backend \
$(BONOBO_HTML_GNOME_CFLAGS) \
-DEVOLUTION_VERSION=\""$(VERSION)"\" \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
@@ -22,13 +23,13 @@ evolution_addressbook_SOURCES = \
addressbook.c \
addressbook.h
-evolution_addressbook_LDADD = \
- $(EXTRA_GNOME_LIBS) \
- $(BONOBO_HTML_GNOME_LIBS) \
- $(top_builddir)/addressbook/gui/minicard/libeminicard.a \
- $(top_builddir)/widgets/e-text/libetext.a \
- $(top_builddir)/e-util/libeutil.la \
- $(top_builddir)/addressbook/backend/ebook/libebook.la \
+evolution_addressbook_LDADD = \
+ $(EXTRA_GNOME_LIBS) \
+ $(BONOBO_HTML_GNOME_LIBS) \
+ $(top_builddir)/addressbook/gui/minicard/libeminicard.a \
+ $(top_builddir)/widgets/e-text/libetext.a \
+ $(top_builddir)/e-util/libeutil.la \
+ $(top_builddir)/addressbook/backend/ebook/libebook.la \
$(top_builddir)/addressbook/contact-editor/libecontacteditor.a \
$(top_builddir)/libversit/libversit.la
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
index e6de7cf9ad..bb4b20406f 100644
--- a/addressbook/gui/component/addressbook.c
+++ b/addressbook/gui/component/addressbook.c
@@ -15,8 +15,8 @@
#include "addressbook.h"
-#include "e-book.h"
-#include "e-canvas.h"
+#include <ebook/e-book.h>
+#include <e-util/e-canvas.h>
#include "e-minicard-view.h"
#include "e-contact-editor.h"
diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am
index 0e8b924e5e..0a8b3a8489 100644
--- a/addressbook/gui/contact-editor/Makefile.am
+++ b/addressbook/gui/contact-editor/Makefile.am
@@ -1,18 +1,20 @@
imagesdir = $(datadir)/images/evolution
-
images = email.png head.png phone.png snailmail.png web.png arrow.png briefcase.png netmeeting.png netfreebusy.png
EXTRA_DIST = $(images)
pkgdata_DATA = $(images)
-CPPFLAGS = \
- -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
+CPPFLAGS = \
+ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DDATADIR=\""$(datadir)"\"
INCLUDES = \
$(GNOME_INCLUDEDIR) \
- -I$(top_srcdir)/addressbook/backend/ebook \
- -DEVOLUTION_IMAGES=\""$(imagesdir)"\"
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/addressbook/ \
+ -I$(top_srcdir)/addressbook/backend \
+ -DEVOLUTION_IMAGES=\""$(imagesdir)"\" \
+ -DG_LOG_DOMAIN=\"contact-editor\"
noinst_LIBRARIES = \
libecontacteditor.a
@@ -21,23 +23,22 @@ libecontacteditor_a_SOURCES = \
e-contact-editor.c \
e-contact-editor.h
-noinst_PROGRAMS = \
+noinst_PROGRAMS = \
contact-editor-test
contact_editor_test_SOURCES = \
test-editor.c
-contact_editor_test_LDADD = \
+contact_editor_test_LDADD = \
$(top_builddir)/addressbook/backend/ebook/libebook.la \
- $(top_builddir)/libversit/libversit.la \
- $(GNOMEGNORBA_LIBS) \
- -lbonobo \
- $(top_builddir)/e-util/libeutil.la \
- libecontacteditor.a \
+ $(top_builddir)/libversit/libversit.la \
+ $(GNOMEGNORBA_LIBS) \
+ -lbonobo \
+ $(top_builddir)/e-util/libeutil.la \
+ libecontacteditor.a \
$(EXTRA_GNOME_LIBS)
gladedir = $(datadir)/evolution/glade
glade_DATA = \
contact-editor.glade
-
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 2bb76cebe1..5067b4ff25 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -20,8 +20,10 @@
* Boston, MA 02111-1307, USA.
*/
+#include <config.h>
#include <gnome.h>
#include "e-contact-editor.h"
+
static void e_contact_editor_init (EContactEditor *card);
static void e_contact_editor_class_init (EContactEditorClass *klass);
static void e_contact_editor_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
diff --git a/addressbook/gui/contact-editor/e-contact-editor.h b/addressbook/gui/contact-editor/e-contact-editor.h
index 72f87e9b08..82f4a22623 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.h
+++ b/addressbook/gui/contact-editor/e-contact-editor.h
@@ -23,7 +23,7 @@
#include <gnome.h>
#include <glade/glade.h>
-#include "e-card.h"
+#include <ebook/e-card.h>
#ifdef __cplusplus
extern "C" {
diff --git a/addressbook/gui/minicard/Makefile.am b/addressbook/gui/minicard/Makefile.am
index 46adb6da2b..44cbed0819 100644
--- a/addressbook/gui/minicard/Makefile.am
+++ b/addressbook/gui/minicard/Makefile.am
@@ -1,15 +1,16 @@
-INCLUDES = \
- -I$(top_srcdir)/addressbook/backend/ebook \
+INCLUDES = \
+ -DG_LOG_DOMAIN=\"e-minicard\" \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/addressbook/backend \
+ -I$(top_builddir)/addressbook/backend \
-I$(top_srcdir)/addressbook/contact-editor \
- -I$(top_builddir)/addressbook/backend/ebook \
- -I$(top_srcdir)/widgets/e-text \
- -I$(top_srcdir)/e-util \
+ -I$(top_srcdir)/widgets/e-text \
$(GNOME_INCLUDEDIR)
noinst_LIBRARIES = \
libeminicard.a
-libeminicard_a_SOURCES = \
+libeminicard_a_SOURCES = \
e-minicard.c \
e-minicard.h \
e-minicard-label.c \
@@ -21,61 +22,61 @@ libeminicard_a_SOURCES = \
e-reflow.c \
e-reflow.h
-noinst_PROGRAMS = \
- minicard-label-test \
- minicard-test \
- reflow-test \
+noinst_PROGRAMS = \
+ minicard-label-test \
+ minicard-test \
+ reflow-test \
minicard-view-test
minicard_label_test_SOURCES = \
test-minicard-label.c
-minicard_label_test_LDADD = \
- $(EXTRA_GNOME_LIBS) \
+minicard_label_test_LDADD = \
+ $(EXTRA_GNOME_LIBS) \
$(GNOMEGNORBA_LIBS) \
- libeminicard.a \
+ libeminicard.a \
-lbonobo \
- $(top_builddir)/e-util/libeutil.la \
+ $(top_builddir)/e-util/libeutil.la \
$(top_builddir)/widgets/e-text/libetext.a
minicard_test_SOURCES = \
test-minicard.c
-minicard_test_LDADD = \
- $(EXTRA_GNOME_LIBS) \
- $(GNOMEGNORBA_LIBS) \
- libeminicard.a \
- -lbonobo \
- $(top_builddir)/e-util/libeutil.la \
- $(top_builddir)/addressbook/backend/ebook/libebook.la \
- $(top_builddir)/libversit/libversit.la \
+minicard_test_LDADD = \
+ $(EXTRA_GNOME_LIBS) \
+ $(GNOMEGNORBA_LIBS) \
+ libeminicard.a \
+ -lbonobo \
+ $(top_builddir)/e-util/libeutil.la \
+ $(top_builddir)/addressbook/backend/ebook/libebook.la \
+ $(top_builddir)/libversit/libversit.la \
$(top_builddir)/addressbook/contact-editor/libecontacteditor.a \
$(top_builddir)/widgets/e-text/libetext.a
reflow_test_SOURCES = \
test-reflow.c
-reflow_test_LDADD = \
- $(EXTRA_GNOME_LIBS) \
- $(GNOMEGNORBA_LIBS) \
- libeminicard.a \
- -lbonobo \
- $(top_builddir)/e-util/libeutil.la \
- $(top_builddir)/addressbook/backend/ebook/libebook.la \
- $(top_builddir)/libversit/libversit.la \
+reflow_test_LDADD = \
+ $(EXTRA_GNOME_LIBS) \
+ $(GNOMEGNORBA_LIBS) \
+ libeminicard.a \
+ -lbonobo \
+ $(top_builddir)/e-util/libeutil.la \
+ $(top_builddir)/addressbook/backend/ebook/libebook.la \
+ $(top_builddir)/libversit/libversit.la \
$(top_builddir)/addressbook/contact-editor/libecontacteditor.a \
$(top_builddir)/widgets/e-text/libetext.a
minicard_view_test_SOURCES = \
test-minicard-view.c
-minicard_view_test_LDADD = \
- $(EXTRA_GNOME_LIBS) \
- $(GNOMEGNORBA_LIBS) \
- libeminicard.a \
- -lbonobo \
- $(top_builddir)/e-util/libeutil.la \
- $(top_builddir)/addressbook/backend/ebook/libebook.la \
- $(top_builddir)/libversit/libversit.la \
+minicard_view_test_LDADD = \
+ $(EXTRA_GNOME_LIBS) \
+ $(GNOMEGNORBA_LIBS) \
+ libeminicard.a \
+ -lbonobo \
+ $(top_builddir)/e-util/libeutil.la \
+ $(top_builddir)/addressbook/backend/ebook/libebook.la \
+ $(top_builddir)/libversit/libversit.la \
$(top_builddir)/addressbook/contact-editor/libecontacteditor.a \
$(top_builddir)/widgets/e-text/libetext.a
diff --git a/addressbook/gui/minicard/e-minicard-label.c b/addressbook/gui/minicard/e-minicard-label.c
index 799eb87cd1..e0e5c98118 100644
--- a/addressbook/gui/minicard/e-minicard-label.c
+++ b/addressbook/gui/minicard/e-minicard-label.c
@@ -20,12 +20,14 @@
* Boston, MA 02111-1307, USA.
*/
+#include <config.h>
#include <gnome.h>
#include "e-minicard-label.h"
#include "e-text.h"
-#include "e-canvas.h"
-#include "e-util.h"
-#include "e-canvas-utils.h"
+#include <e-util/e-canvas.h>
+#include <e-util/e-util.h>
+#include <e-util/e-canvas-utils.h>
+
static void e_minicard_label_init (EMinicardLabel *card);
static void e_minicard_label_class_init (EMinicardLabelClass *klass);
static void e_minicard_label_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
diff --git a/addressbook/gui/minicard/e-minicard-view.c b/addressbook/gui/minicard/e-minicard-view.c
index 080693b354..35024d9564 100644
--- a/addressbook/gui/minicard/e-minicard-view.c
+++ b/addressbook/gui/minicard/e-minicard-view.c
@@ -22,7 +22,7 @@
#include <config.h>
#include <gnome.h>
-#include "e-canvas.h"
+#include <e-util/e-canvas.h>
#include "e-minicard-view.h"
#include "e-minicard.h"
static void e_minicard_view_init (EMinicardView *reflow);
diff --git a/addressbook/gui/minicard/e-minicard-view.h b/addressbook/gui/minicard/e-minicard-view.h
index bb50aa99c1..ab0eeb892d 100644
--- a/addressbook/gui/minicard/e-minicard-view.h
+++ b/addressbook/gui/minicard/e-minicard-view.h
@@ -23,7 +23,7 @@
#include <gnome.h>
#include "e-reflow-sorted.h"
-#include "e-book.h"
+#include <ebook/e-book.h>
#ifdef __cplusplus
extern "C" {
diff --git a/addressbook/gui/minicard/e-minicard.c b/addressbook/gui/minicard/e-minicard.c
index 0b6cbd428a..addb019510 100644
--- a/addressbook/gui/minicard/e-minicard.c
+++ b/addressbook/gui/minicard/e-minicard.c
@@ -20,16 +20,18 @@
* Boston, MA 02111-1307, USA.
*/
+#include <config.h>
#include <gnome.h>
#include "e-minicard.h"
#include "e-minicard-label.h"
#include "e-text.h"
-#include "e-book.h"
-#include "e-canvas.h"
-#include "e-util.h"
-#include "e-canvas-utils.h"
+#include <ebook/e-book.h>
+#include <e-util/e-canvas.h>
+#include <e-util/e-util.h>
+#include <e-util/e-canvas-utils.h>
#include "e-contact-editor.h"
#include "e-minicard-view.h"
+
static void e_minicard_init (EMinicard *card);
static void e_minicard_class_init (EMinicardClass *klass);
static void e_minicard_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
diff --git a/addressbook/gui/minicard/e-minicard.h b/addressbook/gui/minicard/e-minicard.h
index 85481d586e..6844e136bd 100644
--- a/addressbook/gui/minicard/e-minicard.h
+++ b/addressbook/gui/minicard/e-minicard.h
@@ -22,7 +22,7 @@
#define __E_MINICARD_H__
#include <gnome.h>
-#include "e-card.h"
+#include <ebook/e-card.h>
#ifdef __cplusplus
extern "C" {
diff --git a/addressbook/gui/minicard/e-reflow-sorted.c b/addressbook/gui/minicard/e-reflow-sorted.c
index 696efe454a..c70d7b2739 100644
--- a/addressbook/gui/minicard/e-reflow-sorted.c
+++ b/addressbook/gui/minicard/e-reflow-sorted.c
@@ -20,13 +20,14 @@
* Boston, MA 02111-1307, USA.
*/
-#include <gnome.h>
+#include <config.h>
#include <math.h>
+#include <gnome.h>
#include "e-reflow-sorted.h"
-#include "e-canvas-utils.h"
-#include "e-canvas.h"
-#include "e-util.h"
-#include <glib.h>
+#include <e-util/e-canvas-utils.h>
+#include <e-util/e-canvas.h>
+#include <e-util/e-util.h>
+
static void e_reflow_sorted_init (EReflowSorted *card);
static void e_reflow_sorted_class_init (EReflowSortedClass *klass);
static void e_reflow_sorted_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
diff --git a/addressbook/gui/minicard/e-reflow.c b/addressbook/gui/minicard/e-reflow.c
index 004183727a..6706357ede 100644
--- a/addressbook/gui/minicard/e-reflow.c
+++ b/addressbook/gui/minicard/e-reflow.c
@@ -20,12 +20,14 @@
* Boston, MA 02111-1307, USA.
*/
+#include <config.h>
#include <gnome.h>
#include <math.h>
#include "e-reflow.h"
-#include "e-canvas-utils.h"
-#include "e-canvas.h"
-#include "e-util.h"
+#include <e-util/e-canvas-utils.h>
+#include <e-util/e-canvas.h>
+#include <e-util/e-util.h>
+
static void e_reflow_init (EReflow *reflow);
static void e_reflow_class_init (EReflowClass *klass);
static void e_reflow_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
diff --git a/addressbook/gui/minicard/test-minicard-label.c b/addressbook/gui/minicard/test-minicard-label.c
index 727d709925..adf092206c 100644
--- a/addressbook/gui/minicard/test-minicard-label.c
+++ b/addressbook/gui/minicard/test-minicard-label.c
@@ -21,7 +21,7 @@
#include <gnome.h>
#include "e-minicard-label.h"
-#include "e-canvas.h"
+#include <e-util/e-canvas.h>
/* This is a horrible thing to do, but it is just a test. */
GnomeCanvasItem *label;
diff --git a/addressbook/gui/minicard/test-minicard-view.c b/addressbook/gui/minicard/test-minicard-view.c
index d3ceff228e..c03d11d07e 100644
--- a/addressbook/gui/minicard/test-minicard-view.c
+++ b/addressbook/gui/minicard/test-minicard-view.c
@@ -20,7 +20,7 @@
#include <gnome.h>
#include <libgnorba/gnorba.h>
#include <bonobo.h>
-#include "e-canvas.h"
+#include <e-util/e-canvas.h>
#include "e-minicard-view.h"
/* This is a horrible thing to do, but it is just a test. */
diff --git a/addressbook/gui/minicard/test-reflow.c b/addressbook/gui/minicard/test-reflow.c
index f80448b687..4817d13120 100644
--- a/addressbook/gui/minicard/test-reflow.c
+++ b/addressbook/gui/minicard/test-reflow.c
@@ -48,7 +48,7 @@
#include "config.h"
#include <gnome.h>
-#include "e-canvas.h"
+#include <e-util/e-canvas.h>
#include "e-reflow.h"
#include "e-minicard.h"
diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am
index 46adb6da2b..44cbed0819 100644
--- a/addressbook/gui/widgets/Makefile.am
+++ b/addressbook/gui/widgets/Makefile.am
@@ -1,15 +1,16 @@
-INCLUDES = \
- -I$(top_srcdir)/addressbook/backend/ebook \
+INCLUDES = \
+ -DG_LOG_DOMAIN=\"e-minicard\" \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/addressbook/backend \
+ -I$(top_builddir)/addressbook/backend \
-I$(top_srcdir)/addressbook/contact-editor \
- -I$(top_builddir)/addressbook/backend/ebook \
- -I$(top_srcdir)/widgets/e-text \
- -I$(top_srcdir)/e-util \
+ -I$(top_srcdir)/widgets/e-text \
$(GNOME_INCLUDEDIR)
noinst_LIBRARIES = \
libeminicard.a
-libeminicard_a_SOURCES = \
+libeminicard_a_SOURCES = \
e-minicard.c \
e-minicard.h \
e-minicard-label.c \
@@ -21,61 +22,61 @@ libeminicard_a_SOURCES = \
e-reflow.c \
e-reflow.h
-noinst_PROGRAMS = \
- minicard-label-test \
- minicard-test \
- reflow-test \
+noinst_PROGRAMS = \
+ minicard-label-test \
+ minicard-test \
+ reflow-test \
minicard-view-test
minicard_label_test_SOURCES = \
test-minicard-label.c
-minicard_label_test_LDADD = \
- $(EXTRA_GNOME_LIBS) \
+minicard_label_test_LDADD = \
+ $(EXTRA_GNOME_LIBS) \
$(GNOMEGNORBA_LIBS) \
- libeminicard.a \
+ libeminicard.a \
-lbonobo \
- $(top_builddir)/e-util/libeutil.la \
+ $(top_builddir)/e-util/libeutil.la \
$(top_builddir)/widgets/e-text/libetext.a
minicard_test_SOURCES = \
test-minicard.c
-minicard_test_LDADD = \
- $(EXTRA_GNOME_LIBS) \
- $(GNOMEGNORBA_LIBS) \
- libeminicard.a \
- -lbonobo \
- $(top_builddir)/e-util/libeutil.la \
- $(top_builddir)/addressbook/backend/ebook/libebook.la \
- $(top_builddir)/libversit/libversit.la \
+minicard_test_LDADD = \
+ $(EXTRA_GNOME_LIBS) \
+ $(GNOMEGNORBA_LIBS) \
+ libeminicard.a \
+ -lbonobo \
+ $(top_builddir)/e-util/libeutil.la \
+ $(top_builddir)/addressbook/backend/ebook/libebook.la \
+ $(top_builddir)/libversit/libversit.la \
$(top_builddir)/addressbook/contact-editor/libecontacteditor.a \
$(top_builddir)/widgets/e-text/libetext.a
reflow_test_SOURCES = \
test-reflow.c
-reflow_test_LDADD = \
- $(EXTRA_GNOME_LIBS) \
- $(GNOMEGNORBA_LIBS) \
- libeminicard.a \
- -lbonobo \
- $(top_builddir)/e-util/libeutil.la \
- $(top_builddir)/addressbook/backend/ebook/libebook.la \
- $(top_builddir)/libversit/libversit.la \
+reflow_test_LDADD = \
+ $(EXTRA_GNOME_LIBS) \
+ $(GNOMEGNORBA_LIBS) \
+ libeminicard.a \
+ -lbonobo \
+ $(top_builddir)/e-util/libeutil.la \
+ $(top_builddir)/addressbook/backend/ebook/libebook.la \
+ $(top_builddir)/libversit/libversit.la \
$(top_builddir)/addressbook/contact-editor/libecontacteditor.a \
$(top_builddir)/widgets/e-text/libetext.a
minicard_view_test_SOURCES = \
test-minicard-view.c
-minicard_view_test_LDADD = \
- $(EXTRA_GNOME_LIBS) \
- $(GNOMEGNORBA_LIBS) \
- libeminicard.a \
- -lbonobo \
- $(top_builddir)/e-util/libeutil.la \
- $(top_builddir)/addressbook/backend/ebook/libebook.la \
- $(top_builddir)/libversit/libversit.la \
+minicard_view_test_LDADD = \
+ $(EXTRA_GNOME_LIBS) \
+ $(GNOMEGNORBA_LIBS) \
+ libeminicard.a \
+ -lbonobo \
+ $(top_builddir)/e-util/libeutil.la \
+ $(top_builddir)/addressbook/backend/ebook/libebook.la \
+ $(top_builddir)/libversit/libversit.la \
$(top_builddir)/addressbook/contact-editor/libecontacteditor.a \
$(top_builddir)/widgets/e-text/libetext.a
diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c
index 799eb87cd1..e0e5c98118 100644
--- a/addressbook/gui/widgets/e-minicard-label.c
+++ b/addressbook/gui/widgets/e-minicard-label.c
@@ -20,12 +20,14 @@
* Boston, MA 02111-1307, USA.
*/
+#include <config.h>
#include <gnome.h>
#include "e-minicard-label.h"
#include "e-text.h"
-#include "e-canvas.h"
-#include "e-util.h"
-#include "e-canvas-utils.h"
+#include <e-util/e-canvas.h>
+#include <e-util/e-util.h>
+#include <e-util/e-canvas-utils.h>
+
static void e_minicard_label_init (EMinicardLabel *card);
static void e_minicard_label_class_init (EMinicardLabelClass *klass);
static void e_minicard_label_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c
index 080693b354..35024d9564 100644
--- a/addressbook/gui/widgets/e-minicard-view.c
+++ b/addressbook/gui/widgets/e-minicard-view.c
@@ -22,7 +22,7 @@
#include <config.h>
#include <gnome.h>
-#include "e-canvas.h"
+#include <e-util/e-canvas.h>
#include "e-minicard-view.h"
#include "e-minicard.h"
static void e_minicard_view_init (EMinicardView *reflow);
diff --git a/addressbook/gui/widgets/e-minicard-view.h b/addressbook/gui/widgets/e-minicard-view.h
index bb50aa99c1..ab0eeb892d 100644
--- a/addressbook/gui/widgets/e-minicard-view.h
+++ b/addressbook/gui/widgets/e-minicard-view.h
@@ -23,7 +23,7 @@
#include <gnome.h>
#include "e-reflow-sorted.h"
-#include "e-book.h"
+#include <ebook/e-book.h>
#ifdef __cplusplus
extern "C" {
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index 0b6cbd428a..addb019510 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -20,16 +20,18 @@
* Boston, MA 02111-1307, USA.
*/
+#include <config.h>
#include <gnome.h>
#include "e-minicard.h"
#include "e-minicard-label.h"
#include "e-text.h"
-#include "e-book.h"
-#include "e-canvas.h"
-#include "e-util.h"
-#include "e-canvas-utils.h"
+#include <ebook/e-book.h>
+#include <e-util/e-canvas.h>
+#include <e-util/e-util.h>
+#include <e-util/e-canvas-utils.h>
#include "e-contact-editor.h"
#include "e-minicard-view.h"
+
static void e_minicard_init (EMinicard *card);
static void e_minicard_class_init (EMinicardClass *klass);
static void e_minicard_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
diff --git a/addressbook/gui/widgets/e-minicard.h b/addressbook/gui/widgets/e-minicard.h
index 85481d586e..6844e136bd 100644
--- a/addressbook/gui/widgets/e-minicard.h
+++ b/addressbook/gui/widgets/e-minicard.h
@@ -22,7 +22,7 @@
#define __E_MINICARD_H__
#include <gnome.h>
-#include "e-card.h"
+#include <ebook/e-card.h>
#ifdef __cplusplus
extern "C" {
diff --git a/addressbook/gui/widgets/test-minicard-label.c b/addressbook/gui/widgets/test-minicard-label.c
index 727d709925..adf092206c 100644
--- a/addressbook/gui/widgets/test-minicard-label.c
+++ b/addressbook/gui/widgets/test-minicard-label.c
@@ -21,7 +21,7 @@
#include <gnome.h>
#include "e-minicard-label.h"
-#include "e-canvas.h"
+#include <e-util/e-canvas.h>
/* This is a horrible thing to do, but it is just a test. */
GnomeCanvasItem *label;
diff --git a/addressbook/gui/widgets/test-minicard-view.c b/addressbook/gui/widgets/test-minicard-view.c
index d3ceff228e..c03d11d07e 100644
--- a/addressbook/gui/widgets/test-minicard-view.c
+++ b/addressbook/gui/widgets/test-minicard-view.c
@@ -20,7 +20,7 @@
#include <gnome.h>
#include <libgnorba/gnorba.h>
#include <bonobo.h>
-#include "e-canvas.h"
+#include <e-util/e-canvas.h>
#include "e-minicard-view.h"
/* This is a horrible thing to do, but it is just a test. */
diff --git a/addressbook/gui/widgets/test-reflow.c b/addressbook/gui/widgets/test-reflow.c
index f80448b687..4817d13120 100644
--- a/addressbook/gui/widgets/test-reflow.c
+++ b/addressbook/gui/widgets/test-reflow.c
@@ -48,7 +48,7 @@
#include "config.h"
#include <gnome.h>
-#include "e-canvas.h"
+#include <e-util/e-canvas.h>
#include "e-reflow.h"
#include "e-minicard.h"