Hi all,

Here is bug information.
http://bugzilla.gnome.org/show_bug.cgi?id=323529

We found another duplicate file "e-util-marshal.list". There's two
copies of e-util-marshal.list in and "evo/e-util" and
"evo/widgets/misc". They're 100% identical. What's more, we noticed the
other modules in evo/widgets, such as evo/widgets/table and
evo/widgets/text, use the copy in evo/e-util rather than their own
built-in copies. We think the one in evo/widgets/misc might be dropped.

Attached the patch, pls review and comment.

Thanks,
-Simon
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/ChangeLog,v
retrieving revision 1.393
diff -u -p -r1.393 ChangeLog
--- ChangeLog	6 Jan 2006 04:26:51 -0000	1.393
+++ ChangeLog	10 Jan 2006 10:29:08 -0000
@@ -1,3 +1,17 @@
+2006-01-10  Simon Zheng  <[EMAIL PROTECTED]>
+
+	* Makefile.am:
+	* e-dateedit.c:
+	* e-image-chooser.c:
+	* e-printable.c:
+	* e-reflow-model.c:
+	* e-reflow.c:
+	* e-search-bar.c:
+	* e-selection-model.c:
+	* gal-combo-box.c:
+	Remove e-util-marshal.list in current directory, and
+	use the copy in evolution/e-util directory instead.
+
 2006-01-06  Parthasarathi Susarla <[EMAIL PROTECTED]>
 	
 	* e-search-bar.c:(clear_verb_cb): assign the data first
Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/Makefile.am,v
retrieving revision 1.67
diff -u -p -r1.67 Makefile.am
--- Makefile.am	18 Dec 2005 09:45:15 -0000	1.67
+++ Makefile.am	10 Jan 2006 10:29:08 -0000
@@ -79,7 +79,6 @@ widgetsinclude_HEADERS =			\
 	gal-combo-text.h
 
 libemiscwidgets_la_SOURCES =			\
-	$(MARSHAL_GENERATED)			\
 	$(widgetsinclude_HEADERS)		\
 	$(pilot_sources)			\
 	e-activity-handler.c			\
@@ -126,8 +125,6 @@ libemiscwidgets_la_SOURCES =			\
 	gal-combo-box.c				\
 	gal-combo-text.c
 
-MARSHAL_GENERATED = e-util-marshal.c e-util-marshal.h
[EMAIL PROTECTED]@
 
 libemiscwidgets_la_LDFLAGS = $(NO_UNDEFINED)
 
@@ -209,7 +206,7 @@ test_info_label_LDADD = 			\
 	$(top_builddir)/e-util/libeutil.la	\
 	$(E_WIDGETS_LIBS)
 
-BUILT_SOURCES = $(MARSHAL_GENERATED)
+BUILT_SOURCES = 
 CLEANFILES    = $(BUILT_SOURCES)
 
 EXTRA_DIST =			\
Index: e-dateedit.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-dateedit.c,v
retrieving revision 1.50
diff -u -p -r1.50 e-dateedit.c
--- e-dateedit.c	10 Jan 2006 08:16:26 -0000	1.50
+++ e-dateedit.c	10 Jan 2006 10:29:08 -0000
@@ -35,7 +35,7 @@
 #endif
 
 #include "e-dateedit.h"
-#include "e-util-marshal.h"
+#include "e-util/e-util-marshal.h"
 
 #include <ctype.h>
 #include <stdio.h>
Index: e-image-chooser.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-image-chooser.c,v
retrieving revision 1.4
diff -u -p -r1.4 e-image-chooser.c
--- e-image-chooser.c	29 Jul 2005 04:05:17 -0000	1.4
+++ e-image-chooser.c	10 Jan 2006 10:29:08 -0000
@@ -33,7 +33,7 @@
 #include <libgnome/gnome-i18n.h>
 
 #include "e-image-chooser.h"
-#include "e-util-marshal.h"
+#include "e-util/e-util-marshal.h"
 
 struct _EImageChooserPrivate {
 
Index: e-printable.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-printable.c,v
retrieving revision 1.10
diff -u -p -r1.10 e-printable.c
--- e-printable.c	17 Jun 2005 15:20:33 -0000	1.10
+++ e-printable.c	10 Jan 2006 10:29:08 -0000
@@ -25,7 +25,7 @@
 
 #include <gtk/gtk.h>
 
-#include "e-util-marshal.h"
+#include "e-util/e-util-marshal.h"
 
 #include "e-util/e-util.h"
 
Index: e-reflow-model.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-reflow-model.c,v
retrieving revision 1.9
diff -u -p -r1.9 e-reflow-model.c
--- e-reflow-model.c	17 Jun 2005 15:20:33 -0000	1.9
+++ e-reflow-model.c	10 Jan 2006 10:29:08 -0000
@@ -23,7 +23,7 @@
 
 #include <config.h>
 
-#include "e-util-marshal.h"
+#include "e-util/e-util-marshal.h"
 
 #include "e-util/e-util.h"
 
Index: e-reflow.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-reflow.c,v
retrieving revision 1.61
diff -u -p -r1.61 e-reflow.c
--- e-reflow.c	23 Jun 2005 09:11:10 -0000	1.61
+++ e-reflow.c	10 Jan 2006 10:29:08 -0000
@@ -31,7 +31,7 @@
 
 #include "text/e-text.h"
 #include "e-util/e-i18n.h"
-#include "e-util-marshal.h"
+#include "e-util/e-util-marshal.h"
 #include "e-util/e-util.h"
 #include "misc/e-unicode.h"
 
Index: e-search-bar.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-search-bar.c,v
retrieving revision 1.91
diff -u -p -r1.91 e-search-bar.c
--- e-search-bar.c	6 Jan 2006 04:26:51 -0000	1.91
+++ e-search-bar.c	10 Jan 2006 10:29:08 -0000
@@ -47,7 +47,7 @@
 #include <string.h>
 
 #include "e-search-bar.h"
-#include "e-util-marshal.h"
+#include "e-util/e-util-marshal.h"
 
 
 enum {
Index: e-selection-model.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-selection-model.c,v
retrieving revision 1.22
diff -u -p -r1.22 e-selection-model.c
--- e-selection-model.c	17 Jun 2005 15:20:33 -0000	1.22
+++ e-selection-model.c	10 Jan 2006 10:29:08 -0000
@@ -26,7 +26,7 @@
 #include <gdk/gdkkeysyms.h>
 
 #include "e-util/e-i18n.h"
-#include "e-util-marshal.h"
+#include "e-util/e-util-marshal.h"
 #include "e-util/e-util.h"
 
 #include "e-selection-model.h"
Index: gal-combo-box.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/gal-combo-box.c,v
retrieving revision 1.4
diff -u -p -r1.4 gal-combo-box.c
--- gal-combo-box.c	17 Jun 2005 15:20:33 -0000	1.4
+++ gal-combo-box.c	10 Jan 2006 10:29:08 -0000
@@ -29,7 +29,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
-#include "e-util-marshal.h"
+#include "e-util/e-util-marshal.h"
 #include "e-util/e-util.h"
 
 #include "gal-combo-box.h"
_______________________________________________
Evolution-hackers mailing list
Evolution-hackers@gnome.org
http://mail.gnome.org/mailman/listinfo/evolution-hackers

Reply via email to