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

[Irene Huang <Irene Huang Sun COM>]

Hi, Harish

	The patches in the previous email are for evolution-2.4 only. I just
tried with evoluton trunk and see that tml has already change all the
inclusion of e-util/e-time-utils.h to libedataserver/e-time-utils.h.
However, we reckon that, using the copy of e-list.[c|h],
e-list-iterator.[c|h] and e-iterator.[c|h] in libedataserver will be
better, for the NULL pointers are treated more reasonably in
libedataserver. These NULL pointers accounts for a great number of
evolution crashes on Solaris. 

Therefore, I present these patches: one for evolution/e-util and one for
evolution/widgets

Please review. 

Thanks

--Irene 

On Fri, 2005-12-09 at 11:01, Irene Huang wrote:
> Hi, Harish 
> 
>         I created these patches removing all to the identical files
> listed on
> http://live.gnome.org/EvolutionEUtilDieDieDie from libeutil and change
> all the included files, which have an identical counterpart in
> libedataserver, from e-util/*.h to libedataser*,h. 
> 
> Everything looks fine after the removal and I haven't run into any
> functional problems so far. 
> 
> Please review. 
> 
> Thanks
> 
> --Irene 
> 
> 
> ______________________________________________________________________
> _______________________________________________
> Evolution-patches mailing list
> Evolution-patches gnome org
> http://mail.gnome.org/mailman/listinfo/evolution-patches

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>
 
 	* 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>

Index: widgets/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/widgets/ChangeLog,v
retrieving revision 1.139.2.3
diff -u -r1.139.2.3 ChangeLog
--- widgets/ChangeLog	5 Dec 2005 09:21:52 -0000	1.139.2.3
+++ widgets/ChangeLog	8 Dec 2005 13:54:45 -0000
@@ -1,3 +1,14 @@
+2005-12-08  Irene Huang <Irene Huang sun com>
+
+	* menus/Makefile.am: Add E_WIDGETS_CFLAGS to INCLUDES.
+	* menus/gal-view-menus.c:
+	* misc/e-cell-date-edit.c:
+	* misc/e-dateedit.c:
+	* misc/e-unicode.c:
+	Change #include <e-util/e-time-utils.h> to #include
+	<libedataserver/e-time-utils.h>, #include "e-util/e-iconv.h" 
+	#include "libedataserver/e-iconv.h".
+
 2005-12-05  Harish Krishnaswamy  <kharish novell com>
 
 	* table/e-table-example-2.c: (create_table):
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)
 
 libmenus_la_SOURCES = 				\
 	gal-view-menus.c			\
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	8 Dec 2005 13:54:45 -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-cell-date-edit.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-cell-date-edit.c,v
retrieving revision 1.23
diff -u -r1.23 e-cell-date-edit.c
--- ./widgets/misc/e-cell-date-edit.c	17 Jun 2005 15:20:33 -0000	1.23
+++ ./widgets/misc/e-cell-date-edit.c	8 Dec 2005 13:54:46 -0000
@@ -46,7 +46,7 @@
 #include <libgnomeui/gnome-messagebox.h>
 #include <libgnome/gnome-i18n.h>
 
-#include "e-util/e-time-utils.h"
+#include <libedataserver/e-time-utils.h>
 /* This depends on ECalendar which is why I didn't put it in gal. */
 #include "e-calendar.h"
 
Index: ./widgets/misc/e-dateedit.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-dateedit.c,v
retrieving revision 1.45
diff -u -r1.45 e-dateedit.c
--- ./widgets/misc/e-dateedit.c	17 Jun 2005 15:20:33 -0000	1.45
+++ ./widgets/misc/e-dateedit.c	8 Dec 2005 13:54:47 -0000
@@ -59,7 +59,7 @@
 #include <atk/atkrelationset.h>
 #include <libgnome/gnome-i18n.h>
 #include <e-util/e-util.h>
-#include "e-util/e-time-utils.h"
+#include <libedataserver/e-time-utils.h>
 #include "e-calendar.h"
 
 
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	8 Dec 2005 13:54:47 -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"