From 7360a3396cb67d9c9a09e31126ee2ea0133a7007 Mon Sep 17 00:00:00 2001 From: Veerapuram Varadhan Date: Mon, 12 Dec 2005 16:24:21 +0000 Subject: Patch from Irene Huang . * Remove files that have an identical counterpart in libedataserver. * Replace the use of such files with appropriate counterpart path. svn path=/trunk/; revision=30758 --- e-util/ChangeLog | 33 +++++++++++++++++++++++++++++++++ e-util/Makefile.am | 18 +----------------- e-util/e-account-list.h | 2 +- e-util/e-account.c | 2 +- e-util/e-signature-list.c | 2 +- e-util/e-signature-list.h | 2 +- e-util/e-signature.c | 2 +- 7 files changed, 39 insertions(+), 22 deletions(-) (limited to 'e-util') diff --git a/e-util/ChangeLog b/e-util/ChangeLog index ae2a0a7a44..4065a68ca2 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,36 @@ +2005-12-12 Irene Huang + + reviewed by: Veerapuram Varadhan + + * Makefile.am: Remove files that have an identical counterpart in + libedataserver, e-list.[c|h], e-list-iterator.[c|h], e-iconv.[c|h] + e-component-listener.[c|h], md5-utils.[c|h], e-time-utils.[c|h], + e-uid.[c|h]. Change md5-utils.h to e-html-utils.h in pilot-compile. + * e-component-listener.c: + * e-component-listener.h: + * e-iterator.c: + * e-iterator.h: + * e-time-utils.c: + * e-time-utils.h: + * e-iconv.c: + * e-iconv.h: + * e-uid.c: + * e-uid.h: + * md5-utils.c: + * md5-utils.h: + * e-list-iterator.h: + * e-list-iterator.c: + * e-list.h: + * e-list.c: + Removed + * e-account-list.h: + * e-account.c: + * e-signature-list.c: + * e-signature.c: + * e-signature-list.h: Change inclusion of + to . Change inclusion of "e-uid.h" and + "e-list.h" to and . + 2005-12-09 Harish Krishnaswamy * e-util.[ch] (e_str_compare), (e_str_case_compare), diff --git a/e-util/Makefile.am b/e-util/Makefile.am index caf4df42e4..0ae9076b01 100644 --- a/e-util/Makefile.am +++ b/e-util/Makefile.am @@ -45,7 +45,6 @@ eutilinclude_HEADERS = \ e-account.h \ e-bconf-map.h \ e-categories-config.h \ - e-component-listener.h \ e-config.h \ e-config-listener.h \ e-corba-utils.h \ @@ -61,9 +60,6 @@ eutilinclude_HEADERS = \ e-html-utils.h \ e-icon-factory.h \ e-import.h \ - e-iterator.h \ - e-list-iterator.h \ - e-list.h \ e-menu.h \ e-mktemp.h \ e-print.h \ @@ -73,11 +69,7 @@ eutilinclude_HEADERS = \ e-request.h \ e-signature.h \ e-signature-list.h \ - e-time-utils.h \ - e-uid.h \ - md5-utils.h \ e-bit-array.h \ - e-iconv.h \ e-sorter.h \ e-sorter-array.h \ e-text-event-processor-emacs-like.h \ @@ -94,7 +86,6 @@ libeutil_la_SOURCES = \ e-account.c \ e-bconf-map.c \ e-categories-config.c \ - e-component-listener.c \ e-config.c \ e-config-listener.c \ e-corba-utils.c \ @@ -110,9 +101,6 @@ libeutil_la_SOURCES = \ e-html-utils.c \ e-icon-factory.c \ e-import.c \ - e-iterator.c \ - e-list-iterator.c \ - e-list.c \ e-menu.c \ e-mktemp.c \ e-plugin.c \ @@ -122,14 +110,10 @@ libeutil_la_SOURCES = \ e-request.c \ e-signature.c \ e-signature-list.c \ - e-time-utils.c \ - e-uid.c \ eggtrayicon.c \ eggtrayicon.h \ - md5-utils.c \ e-bit-array.c \ e-i18n.h \ - e-iconv.c \ e-sorter.c \ e-sorter-array.c \ e-text-event-processor-emacs-like.c \ @@ -162,7 +146,7 @@ pilot_sources = \ if ENABLE_PILOT_CONDUITS pilot_compile = $(pilot_sources) else -pilot_compile = md5-utils.c +pilot_compile = e-html-utils.c endif libeconduit_la_SOURCES = $(pilot_compile) diff --git a/e-util/e-account-list.h b/e-util/e-account-list.h index 02b801aded..2b1a097d1f 100644 --- a/e-util/e-account-list.h +++ b/e-util/e-account-list.h @@ -20,7 +20,7 @@ #ifndef __E_ACCOUNT_LIST__ #define __E_ACCOUNT_LIST__ -#include "e-list.h" +#include #include "e-account.h" #include diff --git a/e-util/e-account.c b/e-util/e-account.c index 89c0525336..af505b1784 100644 --- a/e-util/e-account.c +++ b/e-util/e-account.c @@ -23,7 +23,7 @@ #include "e-account.h" -#include "e-uid.h" +#include #include diff --git a/e-util/e-signature-list.c b/e-util/e-signature-list.c index e7812f0181..8d89cb0236 100644 --- a/e-util/e-signature-list.c +++ b/e-util/e-signature-list.c @@ -27,7 +27,7 @@ #include -#include "e-uid.h" +#include #include "e-util-marshal.h" diff --git a/e-util/e-signature-list.h b/e-util/e-signature-list.h index cec82f9c6f..42509fe836 100644 --- a/e-util/e-signature-list.h +++ b/e-util/e-signature-list.h @@ -24,7 +24,7 @@ #ifndef __E_SIGNATURE_LIST__ #define __E_SIGNATURE_LIST__ -#include +#include #include #include diff --git a/e-util/e-signature.c b/e-util/e-signature.c index c02857abb6..07fe31de9f 100644 --- a/e-util/e-signature.c +++ b/e-util/e-signature.c @@ -33,7 +33,7 @@ #include -#include "e-uid.h" +#include #include "e-signature.h" -- cgit