From a2ee0e2ec91ae9dec0bd10cbc716651dfdf0932a Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Thu, 20 Apr 2000 23:18:51 +0000 Subject: Use "e-minicard" as the log domain. 2000-04-18 Federico Mena Quintero * 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 --- addressbook/backend/ebook/Makefile.am | 12 +++++------- addressbook/backend/ebook/e-book-listener.c | 3 ++- addressbook/backend/ebook/e-book-listener.h | 4 ++-- addressbook/backend/ebook/e-book-view-listener.c | 7 ++++--- addressbook/backend/ebook/e-book-view-listener.h | 2 +- addressbook/backend/ebook/e-book-view.c | 9 +++++---- addressbook/backend/ebook/e-book-view.h | 4 ++-- addressbook/backend/ebook/e-book.c | 9 +++++---- addressbook/backend/ebook/e-book.h | 8 ++++---- addressbook/backend/ebook/e-card-cursor.h | 4 ++-- addressbook/backend/ebook/e-card-iterator.c | 2 +- addressbook/backend/ebook/e-card-list-iterator.c | 4 ++-- addressbook/backend/ebook/e-card-list-iterator.h | 4 ++-- addressbook/backend/ebook/e-card-list.c | 4 ++-- addressbook/backend/ebook/e-card-list.h | 2 +- addressbook/backend/ebook/e-card-pairs.h | 4 ++-- addressbook/backend/ebook/e-card.c | 6 +++--- addressbook/backend/ebook/e-card.h | 4 ++-- addressbook/backend/ebook/test-card.c | 2 +- addressbook/backend/ebook/test-client-list.c | 2 +- 20 files changed, 49 insertions(+), 47 deletions(-) (limited to 'addressbook/backend/ebook') 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 #include -#include +#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 #include -#include -#include +#include +#include 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 #include -#include -#include -#include +#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 #include -#include +#include 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 +#include #include #include #include -#include -#include -#include +#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 -#include -#include +#include +#include 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 +#include #include #include #include -#include -#include -#include +#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 -#include -#include -#include -#include +#include +#include +#include +#include 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 #include -#include "addressbook/backend/ebook/addressbook.h" -#include "e-card.h" +#include +#include 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 #include -#include +#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 #include -#include -#include +#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 #include #include -#include -#include +#include +#include #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 #include -#include -#include +#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 #include #include -#include +#include #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 +#include +#include #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 #include -#include "libversit/vcc.h" -#include -#include +#include +#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 #include #include -#include -#include +#include +#include #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 -#include +#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 #include -#include +#include "e-book.h" CORBA_Environment ev; CORBA_ORB orb; -- cgit v1.2.3