Re: [evolution-patches] Removal of duplicated files in evolution/e-util, possible partly fix for bug #323529e

[Irene Huang <Irene Huang Sun COM>]

hi, Veerapuram

 	Here're the updated patch. Please review, 

Thanks

--Irene 

On Mon, 2005-12-12 at 17:49, Veerapuram Varadhan wrote:
> On Fri, 2005-12-09 at 08:54 +0000, Irene Huang  wrote:
> > Index: e-util/ChangeLog
> > ===================================================================
> > RCS file: /cvs/gnome/evolution/e-util/ChangeLog,v
> > retrieving revision 1.563
> > diff -u -r1.563 ChangeLog
> > --- e-util/ChangeLog    26 Nov 2005 03:51:16 -0000      1.563
> > +++ e-util/ChangeLog    9 Dec 2005 08:34:07 -0000
> > @@ -1,3 +1,17 @@
> > +2005-12-09  set REAL_NAME environment variable  <set EMAIL_ADDRESS
> > environment variable>
> > +
> > +       reviewed by: <delete if not using a buddy>
> > +
> > +       * Makefile.am: Remove e-list.[c|h], e-list-iterator.[c|h] and
> > +       e-iterator.[c|h].
> > +       * e-list-iterator.h:
> > +       * e-list.h:
> > +       * e-signature-list.h:
> > +       Change inclusion of <e-util/e-list.h> to
> > <libedataserver/e-list.h>,
> > +       <e-util/e-list-iterator.h> to
> > <libedataserver/e-list-iterator.h> 
> > +       and  <e-util/e-iterator.h>
> > +       to <libedataserver/e-iterator.h>.
> > +
> >  2005-11-26  Tor Lillqvist  <tml novell com>
> >  
> 
> I guess that is a *generic* header, unless otherwise you missed to run
> some tools to put your name there. :-)
> 
> >         * e-dialog-utils.c
> > Index: e-util/e-list-iterator.h
> > ===================================================================
> > RCS file: /cvs/gnome/evolution/e-util/e-list-iterator.h,v
> > retrieving revision 1.4
> > diff -u -r1.4 e-list-iterator.h
> > --- e-util/e-list-iterator.h    3 Nov 2002 05:46:46 -0000       1.4
> > +++ e-util/e-list-iterator.h    9 Dec 2005 08:34:07 -0000
> > @@ -18,8 +18,8 @@
> >  #include <glib.h>
> >  #include <glib-object.h>
> >  
> > -#include <e-util/e-iterator.h>
> > -#include <e-util/e-list.h>
> > +#include <libedataserver/e-iterator.h>
> > +#include <libedataserver/e-list.h>
> >  
> >  #define E_TYPE_LIST_ITERATOR            (e_list_iterator_get_type ())
> >  #define E_LIST_ITERATOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST
> > ((obj), E_TYPE_LIST_ITERATOR, EListIterator))
> > Index: e-util/e-list.h
> > ===================================================================
> > RCS file: /cvs/gnome/evolution/e-util/e-list.h,v
> > retrieving revision 1.7
> > diff -u -r1.7 e-list.h
> > --- e-util/e-list.h     16 Jan 2003 19:38:44 -0000      1.7
> > +++ e-util/e-list.h     9 Dec 2005 08:34:07 -0000
> > @@ -17,7 +17,7 @@
> >  #include <time.h>
> >  #include <glib.h>
> >  #include <glib-object.h>
> > -#include <e-util/e-list-iterator.h>
> > +#include <libedataserver/e-list-iterator.h>
> >  
> >  #define E_TYPE_LIST            (e_list_get_type ())
> >  #define E_LIST(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj),
> > E_TYPE_LIST, EList))
> > Index: e-util/e-signature-list.h
> > ===================================================================
> > RCS file: /cvs/gnome/evolution/e-util/e-signature-list.h,v
> > retrieving revision 1.2
> > diff -u -r1.2 e-signature-list.h
> > --- e-util/e-signature-list.h   12 Apr 2004 17:43:33 -0000      1.2
> > +++ e-util/e-signature-list.h   9 Dec 2005 08:34:07 -0000
> > @@ -24,7 +24,7 @@
> >  #ifndef __E_SIGNATURE_LIST__
> >  #define __E_SIGNATURE_LIST__
> >  
> > -#include <e-util/e-list.h>
> > +#include <libedataserver/e-list.h>
> >  #include <e-util/e-signature.h>
> >  
> >  #include <gconf/gconf-client.h>
> > 
> 
> I guess we don't need to change these files anymore as they are
> expiring. 
> 
> > Index: ./widgets/menus/Makefile.am
> > ===================================================================
> > RCS file: /cvs/gnome/evolution/widgets/menus/Makefile.am,v
> > retrieving revision 1.6
> > diff -u -r1.6 Makefile.am
> > --- ./widgets/menus/Makefile.am 17 Jun 2005 15:20:32 -0000      1.6
> > +++ ./widgets/menus/Makefile.am 8 Dec 2005 13:54:45 -0000
> > @@ -9,7 +9,8 @@
> >         $(EXTRA_GNOME_CFLAGS)                   \
> >         $(GNOME_INCLUDEDIR)                     \
> >         $(ICONV_CFLAGS)                         \
> > -       $(GNOME_FULL_CFLAGS)
> > +       $(GNOME_FULL_CFLAGS)                    \
> > +       $(E_WIDGETS_CFLAGS)
> 
> I guess the diff is not for current HEAD.  Kindly recheck.
> 
> Apart from the above mentioned changes, the patch looks good to commit.
> 
> 
> Thanks,
> 
> V. Varadhan
> _______________________________________________
> Evolution-patches mailing list
> Evolution-patches gnome org
> http://mail.gnome.org/mailman/listinfo/evolution-patches

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-exchange/ChangeLog,v
retrieving revision 1.425
diff -u -r1.425 ChangeLog
--- ChangeLog	10 Dec 2005 10:07:13 -0000	1.425
+++ ChangeLog	12 Dec 2005 09:55:51 -0000
@@ -1,3 +1,8 @@
+2005-12-12  Irene Huang <Irene Huang sun com>
+
+	* addressbook/e-book-backend-exchange.c: Change #include
+	<e-util/e-uid.h> to #include <libedataserver/e-uid.h>.
+
 2005-12-10  Sushma Rai  <rsushma novell com>
 
 	* calendar/e-cal-backend-exchange.c (open_calendar): Return
Index: addressbook/e-book-backend-exchange.c
===================================================================
RCS file: /cvs/gnome/evolution-exchange/addressbook/e-book-backend-exchange.c,v
retrieving revision 1.44
diff -u -r1.44 e-book-backend-exchange.c
--- addressbook/e-book-backend-exchange.c	21 Oct 2005 11:52:21 -0000	1.44
+++ addressbook/e-book-backend-exchange.c	12 Dec 2005 09:55:51 -0000
@@ -32,7 +32,7 @@
 #include <time.h>
 
 #include <libedataserver/e-sexp.h>
-#include <e-util/e-uid.h>
+#include <libedataserver/e-uid.h>
 #include <e-util/e-util.h>
 #include <libebook/e-address-western.h>
 #include <libebook/e-contact.h>

Index: e-util/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/e-util/ChangeLog,v
retrieving revision 1.564
diff -u -r1.564 ChangeLog
--- e-util/ChangeLog	9 Dec 2005 11:01:05 -0000	1.564
+++ e-util/ChangeLog	12 Dec 2005 09:48:24 -0000
@@ -1,3 +1,14 @@
+2005-12-12  Irene Huang <Irene Huang sun com>
+
+	* 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].
+	* e-list-iterator.h: Removed	
+	* e-list.h: Removed
+	* e-signature-list.h: Change inclusion of <e-util/e-list.h>
+	to <libedataserver/e-list.h>.
+
 2005-12-09  Harish Krishnaswamy  <kharish novell com>
 
 	* e-util.[ch] (e_str_compare), (e_str_case_compare),
Index: e-util/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/e-util/Makefile.am,v
retrieving revision 1.137
diff -u -r1.137 Makefile.am
--- e-util/Makefile.am	25 Nov 2005 14:32:54 -0000	1.137
+++ e-util/Makefile.am	12 Dec 2005 09:48:24 -0000
@@ -45,7 +45,6 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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     \
Index: e-util/e-signature-list.h
===================================================================
RCS file: /cvs/gnome/evolution/e-util/e-signature-list.h,v
retrieving revision 1.2
diff -u -r1.2 e-signature-list.h
--- e-util/e-signature-list.h	12 Apr 2004 17:43:33 -0000	1.2
+++ e-util/e-signature-list.h	12 Dec 2005 09:48:24 -0000
@@ -24,7 +24,7 @@
 #ifndef __E_SIGNATURE_LIST__
 #define __E_SIGNATURE_LIST__
 
-#include <e-util/e-list.h>
+#include <libedataserver/e-list.h>
 #include <e-util/e-signature.h>
 
 #include <gconf/gconf-client.h>
Index: widgets/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/widgets/ChangeLog,v
retrieving revision 1.146
diff -u -r1.146 ChangeLog
--- widgets/ChangeLog	6 Dec 2005 08:56:23 -0000	1.146
+++ widgets/ChangeLog	12 Dec 2005 09:48:24 -0000
@@ -1,3 +1,10 @@
+2005-12-12  Irene Huang <Irene Huang sun com>
+
+	* menus/gal-view-menus.c: Change #include <e-util/e-list.h> to
+	#include <libedataserver/e-list.h>.
+	* misc/e-unicode.c: Change #include <e-util/e-iconv.h> to
+	#include <libedataserver/e-iconv.h>.
+
 2005-12-06  Veerapuram Varadhan <vvaradhan novell com>
 
 	* menus/gal-view-new-dialog.c (gal_view_new_dialog_set_property):
Index: widgets/menus/gal-view-menus.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/menus/gal-view-menus.c,v
retrieving revision 1.46
diff -u -r1.46 gal-view-menus.c
--- widgets/menus/gal-view-menus.c	17 Jun 2005 15:20:32 -0000	1.46
+++ widgets/menus/gal-view-menus.c	12 Dec 2005 09:48:24 -0000
@@ -26,7 +26,7 @@
 #include <e-util/e-xml-utils.h>
 #include <widgets/menus/gal-define-views-dialog.h>
 #include <bonobo/bonobo-ui-util.h>
-#include <e-util/e-list.h>
+#include <libedataserver/e-list.h>
 
 struct _GalViewMenusPrivate {
 	GalViewInstance *instance;
Index: widgets/misc/e-unicode.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-unicode.c,v
retrieving revision 1.48
diff -u -r1.48 e-unicode.c
--- widgets/misc/e-unicode.c	17 Jun 2005 15:20:33 -0000	1.48
+++ widgets/misc/e-unicode.c	12 Dec 2005 09:48:24 -0000
@@ -41,7 +41,7 @@
 #include <libxml/xmlmemory.h>
 
 #include "e-util/e-i18n.h"
-#include "e-util/e-iconv.h"
+#include <libedataserver/e-iconv.h>
 
 #include "e-unicode.h"