[evolution-patches] Removal of duplicated files in evolution/e-util, possible partly fix for bug #323529e
- From: Irene Huang <Irene Huang Sun COM>
- To: "evolution-patches gnome org" <evolution-patches gnome org>
- Cc:
- Subject: [evolution-patches] Removal of duplicated files in evolution/e-util, possible partly fix for bug #323529e
- Date: Fri, 09 Dec 2005 11:01:08 +0800
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
Index: calendar/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.2802.2.34
diff -u -r1.2802.2.34 ChangeLog
--- calendar/ChangeLog 30 Nov 2005 09:19:14 -0000 1.2802.2.34
+++ calendar/ChangeLog 8 Dec 2005 13:31:38 -0000
@@ -1,3 +1,23 @@
+2005-12-08 Irene Huang <Irene Huang sun com>
+
+ * gui/alarm-notify/alarm-notify-dialog.c:
+ * gui/alarm-notify/util.c:
+ * gui/dialogs/alarm-dialog.c:
+ * gui/dialogs/alarm-list-dialog.c:
+ * gui/dialogs/comp-editor-util.c:
+ * gui/dialogs/recurrence-page.c:
+ * gui/e-alarm-list.c:
+ * gui/e-cal-component-preview.c:
+ * gui/e-cal-model.c:
+ * gui/e-cell-date-edit-text.c:
+ * gui/e-date-time-list.c:
+ * gui/e-itip-control.c:
+ * gui/e-tasks.c:
+ * gui/itip-utils.c:
+ * gui/print.c:
+ Change #include <e-util/e-time-utils.h> to #include
+ <libedataserver/e-time-utils.h>.
+
2005-11-30 Harish Krishnaswamy <kharish novell com>
* gui/e-calendar-view.c: (e_calendar_view_new_appointment_for):
Index: ./calendar/gui/e-alarm-list.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-alarm-list.c,v
retrieving revision 1.11
diff -u -r1.11 e-alarm-list.c
--- ./calendar/gui/e-alarm-list.c 7 May 2005 09:55:36 -0000 1.11
+++ ./calendar/gui/e-alarm-list.c 8 Dec 2005 13:31:38 -0000
@@ -28,7 +28,7 @@
#include <libgnome/gnome-i18n.h>
#include <glib.h>
#include <libecal/e-cal-time-util.h>
-#include <e-util/e-time-utils.h>
+#include <libedataserver/e-time-utils.h>
#include "calendar-config.h"
#include "e-alarm-list.h"
Index: ./calendar/gui/e-cal-component-preview.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-cal-component-preview.c,v
retrieving revision 1.4
diff -u -r1.4 e-cal-component-preview.c
--- ./calendar/gui/e-cal-component-preview.c 5 Aug 2005 12:15:33 -0000 1.4
+++ ./calendar/gui/e-cal-component-preview.c 8 Dec 2005 13:31:38 -0000
@@ -33,7 +33,7 @@
#include <libecal/e-cal-time-util.h>
#include <gtkhtml/gtkhtml.h>
#include <gtkhtml/gtkhtml-stream.h>
-#include <e-util/e-time-utils.h>
+#include <libedataserver/e-time-utils.h>
#include <e-util/e-categories-config.h>
#include "calendar-config.h"
#include "e-cal-component-preview.h"
Index: ./calendar/gui/e-cal-model.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-cal-model.c,v
retrieving revision 1.61.2.3
diff -u -r1.61.2.3 e-cal-model.c
--- ./calendar/gui/e-cal-model.c 28 Nov 2005 12:32:51 -0000 1.61.2.3
+++ ./calendar/gui/e-cal-model.c 8 Dec 2005 13:31:39 -0000
@@ -25,7 +25,7 @@
#include <string.h>
#include <glib/garray.h>
#include <libgnome/gnome-i18n.h>
-#include <e-util/e-time-utils.h>
+#include <libedataserver/e-time-utils.h>
#include <libecal/e-cal-time-util.h>
#include "comp-util.h"
#include "e-cal-model.h"
Index: ./calendar/gui/e-cell-date-edit-text.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-cell-date-edit-text.c,v
retrieving revision 1.14
diff -u -r1.14 e-cell-date-edit-text.c
--- ./calendar/gui/e-cell-date-edit-text.c 17 Jun 2005 15:20:27 -0000 1.14
+++ ./calendar/gui/e-cell-date-edit-text.c 8 Dec 2005 13:31:39 -0000
@@ -38,7 +38,7 @@
#include <libgnomeui/gnome-stock-icons.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 <libecal/e-cal-time-util.h>
#include "e-cell-date-edit-text.h"
Index: ./calendar/gui/e-date-time-list.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-date-time-list.c,v
retrieving revision 1.7
diff -u -r1.7 e-date-time-list.c
--- ./calendar/gui/e-date-time-list.c 12 Oct 2004 06:58:11 -0000 1.7
+++ ./calendar/gui/e-date-time-list.c 8 Dec 2005 13:31:39 -0000
@@ -25,7 +25,7 @@
#include <gtk/gtksignal.h>
#include <gtk/gtktreednd.h>
#include <glib.h>
-#include <e-util/e-time-utils.h>
+#include <libedataserver/e-time-utils.h>
#include "e-date-time-list.h"
#include <libecal/e-cal-time-util.h>
#include "calendar-config.h"
Index: ./calendar/gui/e-itip-control.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-itip-control.c,v
retrieving revision 1.167.2.2
diff -u -r1.167.2.2 e-itip-control.c
--- ./calendar/gui/e-itip-control.c 20 Oct 2005 11:08:16 -0000 1.167.2.2
+++ ./calendar/gui/e-itip-control.c 8 Dec 2005 13:31:39 -0000
@@ -48,7 +48,7 @@
#include <libecal/e-cal-component.h>
#include <libecal/e-cal-time-util.h>
#include <libecal/e-cal.h>
-#include <e-util/e-time-utils.h>
+#include <libedataserver/e-time-utils.h>
#include <e-util/e-dialog-widgets.h>
#include <e-util/e-html-utils.h>
#include "dialogs/delete-error.h"
Index: ./calendar/gui/e-tasks.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-tasks.c,v
retrieving revision 1.120.2.4
diff -u -r1.120.2.4 e-tasks.c
--- ./calendar/gui/e-tasks.c 20 Oct 2005 11:08:16 -0000 1.120.2.4
+++ ./calendar/gui/e-tasks.c 8 Dec 2005 13:31:39 -0000
@@ -36,7 +36,7 @@
#include "e-util/e-error.h"
#include "e-util/e-categories-config.h"
#include "e-util/e-config-listener.h"
-#include "e-util/e-time-utils.h"
+#include <libedataserver/e-time-utils.h>
#include "shell/e-user-creatable-items-handler.h"
#include <libedataserver/e-url.h>
#include <libedataserver/e-categories.h>
Index: ./calendar/gui/itip-utils.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/itip-utils.c,v
retrieving revision 1.105.2.1
diff -u -r1.105.2.1 itip-utils.c
--- ./calendar/gui/itip-utils.c 30 Sep 2005 11:22:10 -0000 1.105.2.1
+++ ./calendar/gui/itip-utils.c 8 Dec 2005 13:31:40 -0000
@@ -33,7 +33,7 @@
#include <libical/ical.h>
#include <Evolution-Composer.h>
#include <e-util/e-dialog-utils.h>
-#include <e-util/e-time-utils.h>
+#include <libedataserver/e-time-utils.h>
#include <libecal/e-cal-time-util.h>
#include <libecal/e-cal-util.h>
#include <libsoup/soup-session-async.h>
Index: ./calendar/gui/print.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/print.c,v
retrieving revision 1.74.4.1
diff -u -r1.74.4.1 print.c
--- ./calendar/gui/print.c 1 Oct 2005 11:15:58 -0000 1.74.4.1
+++ ./calendar/gui/print.c 8 Dec 2005 13:31:40 -0000
@@ -46,7 +46,7 @@
#include <libgnomeprintui/gnome-print-dialog.h>
#include <e-util/e-util.h>
#include <e-util/e-dialog-widgets.h>
-#include <e-util/e-time-utils.h>
+#include <libedataserver/e-time-utils.h>
#include <e-util/e-print.h>
#include <libecal/e-cal-time-util.h>
#include "calendar-commands.h"
Index: ./calendar/gui/alarm-notify/alarm-notify-dialog.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/alarm-notify/alarm-notify-dialog.c,v
retrieving revision 1.35.2.1
diff -u -r1.35.2.1 alarm-notify-dialog.c
--- ./calendar/gui/alarm-notify/alarm-notify-dialog.c 30 Sep 2005 14:35:03 -0000 1.35.2.1
+++ ./calendar/gui/alarm-notify/alarm-notify-dialog.c 8 Dec 2005 13:31:40 -0000
@@ -37,7 +37,7 @@
# include <libgnomeui/gnome-winhints.h>
#endif
#include <glade/glade.h>
-#include <e-util/e-time-utils.h>
+#include <libedataserver/e-time-utils.h>
#include <libecal/e-cal-time-util.h>
#include "alarm-notify-dialog.h"
#include "config-data.h"
Index: ./calendar/gui/alarm-notify/util.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/alarm-notify/util.c,v
retrieving revision 1.3
diff -u -r1.3 util.c
--- ./calendar/gui/alarm-notify/util.c 22 Jul 2004 03:02:08 -0000 1.3
+++ ./calendar/gui/alarm-notify/util.c 8 Dec 2005 13:31:40 -0000
@@ -24,7 +24,7 @@
#endif
#include <libgnome/gnome-i18n.h>
-#include <e-util/e-time-utils.h>
+#include <libedataserver/e-time-utils.h>
#include <libecal/e-cal-time-util.h>
#include "config-data.h"
#include "util.h"
Index: ./calendar/gui/dialogs/alarm-dialog.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/alarm-dialog.c,v
retrieving revision 1.10
diff -u -r1.10 alarm-dialog.c
--- ./calendar/gui/dialogs/alarm-dialog.c 2 Feb 2005 22:56:51 -0000 1.10
+++ ./calendar/gui/dialogs/alarm-dialog.c 8 Dec 2005 13:31:40 -0000
@@ -46,7 +46,7 @@
#include <bonobo/bonobo-widget.h>
#include <glade/glade.h>
#include "e-util/e-dialog-widgets.h"
-#include "e-util/e-time-utils.h"
+#include <libedataserver/e-time-utils.h>
#include <libecal/e-cal-util.h>
#include <libecal/e-cal-time-util.h>
#include "e-util/e-dialog-widgets.h"
Index: ./calendar/gui/dialogs/alarm-list-dialog.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/alarm-list-dialog.c,v
retrieving revision 1.5
diff -u -r1.5 alarm-list-dialog.c
--- ./calendar/gui/dialogs/alarm-list-dialog.c 2 Feb 2005 22:56:51 -0000 1.5
+++ ./calendar/gui/dialogs/alarm-list-dialog.c 8 Dec 2005 13:31:40 -0000
@@ -39,7 +39,7 @@
#include <libgnome/gnome-i18n.h>
#include <glade/glade.h>
#include "e-util/e-dialog-widgets.h"
-#include "e-util/e-time-utils.h"
+#include <libedataserver/e-time-utils.h>
#include <libecal/e-cal-util.h>
#include <libecal/e-cal-time-util.h>
#include "e-util/e-dialog-widgets.h"
Index: ./calendar/gui/dialogs/comp-editor-util.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/comp-editor-util.c,v
retrieving revision 1.33
diff -u -r1.33 comp-editor-util.c
--- ./calendar/gui/dialogs/comp-editor-util.c 6 Feb 2004 03:03:45 -0000 1.33
+++ ./calendar/gui/dialogs/comp-editor-util.c 8 Dec 2005 13:31:40 -0000
@@ -31,7 +31,7 @@
#include <bonobo-activation/bonobo-activation.h>
#include <bonobo/bonobo-control.h>
#include <bonobo/bonobo-widget.h>
-#include <e-util/e-time-utils.h>
+#include <libedataserver/e-time-utils.h>
#include <libecal/e-cal-time-util.h>
#include "../calendar-config.h"
#include "../e-date-edit-config.h"
Index: ./calendar/gui/dialogs/recurrence-page.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/recurrence-page.c,v
retrieving revision 1.68.2.1
diff -u -r1.68.2.1 recurrence-page.c
--- ./calendar/gui/dialogs/recurrence-page.c 30 Sep 2005 14:45:58 -0000 1.68.2.1
+++ ./calendar/gui/dialogs/recurrence-page.c 8 Dec 2005 13:31:41 -0000
@@ -42,7 +42,7 @@
#include <libgnome/gnome-i18n.h>
#include <glade/glade.h>
#include <e-util/e-dialog-widgets.h>
-#include <e-util/e-time-utils.h>
+#include <libedataserver/e-time-utils.h>
#include <misc/e-dateedit.h>
#include <libecal/e-cal-recur.h>
#include <libecal/e-cal-time-util.h>
Index: e-util/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/e-util/ChangeLog,v
retrieving revision 1.554.2.2
diff -u -r1.554.2.2 ChangeLog
--- e-util/ChangeLog 5 Dec 2005 09:21:50 -0000 1.554.2.2
+++ e-util/ChangeLog 8 Dec 2005 13:40:53 -0000
@@ -1,3 +1,16 @@
+2005-12-08 set REAL_NAME environment variable <set EMAIL_ADDRESS environment variable>
+
+ reviewed by: <delete if not using a buddy>
+
+ * Makefile.am: Remove files duplicated with evolution data server.
+ * e-list-iterator.h: Change #include <e-util/e-iterator.h> to
+ <libedataserver/e-iterator.h>. <e-util/e-list.h> to
+ <libedataserver/e-list.h>.
+ * e-list.h: Change #include <e-util/e-list-iterator.h> to
+ <libedataserver/e-list-iterator.h>.
+ * e-signature-list.h: Change #include <e-util/e-list.h> to
+ <libedataserver/e-list.h>.
+
2005-12-05 Harish Krishnaswamy <kharish novell com>
* e-util.[ch]: (e_str_compare), (e_collate_compare), (e_int_compare):
Index: ./e-util/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/e-util/Makefile.am,v
retrieving revision 1.136
diff -u -r1.136 Makefile.am
--- ./e-util/Makefile.am 10 Aug 2005 09:18:27 -0000 1.136
+++ ./e-util/Makefile.am 8 Dec 2005 13:40:53 -0000
@@ -41,7 +41,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 \
@@ -57,9 +56,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 \
@@ -69,11 +65,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 \
@@ -90,7 +82,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 \
@@ -106,9 +97,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 \
@@ -118,14 +106,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-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 8 Dec 2005 13:40:53 -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 8 Dec 2005 13:40:53 -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 8 Dec 2005 13:40:53 -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: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-exchange/ChangeLog,v
retrieving revision 1.395.2.16
diff -u -r1.395.2.16 ChangeLog
--- ChangeLog 29 Nov 2005 09:11:11 -0000 1.395.2.16
+++ ChangeLog 8 Dec 2005 13:15:46 -0000
@@ -1,3 +1,13 @@
+2005-12-08 Irene Huang <Irene Huang sun com>
+
+ * addressbook/e-book-backend-gal.c:
+ * calendar/e-cal-backend-exchange.c:
+ * lib/e2k-freebusy.c:
+ * lib/e2k-http-utils.c:
+ * lib/e2k-utils.c:
+ Change #include <e-util/e-time-util.h> to
+ <libedataserver/e-time-util.h>.
+
2005-11-29 Sushma Rai <rsushma novell com>
* configure.in : Bumped the version to 2.4.2
Index: calendar/e-cal-backend-exchange.c
===================================================================
RCS file: /cvs/gnome/evolution-exchange/calendar/e-cal-backend-exchange.c,v
retrieving revision 1.42.2.3
diff -u -r1.42.2.3 e-cal-backend-exchange.c
--- calendar/e-cal-backend-exchange.c 28 Nov 2005 11:22:50 -0000 1.42.2.3
+++ calendar/e-cal-backend-exchange.c 8 Dec 2005 13:13:06 -0000
@@ -27,7 +27,7 @@
#include <string.h>
#include <unistd.h>
-#include <e-util/e-time-utils.h>
+#include <libedataserver/e-time-utils.h>
#include <libgnomevfs/gnome-vfs-mime-utils.h>
Index: lib/e2k-freebusy.c
===================================================================
RCS file: /cvs/gnome/evolution-exchange/lib/Attic/e2k-freebusy.c,v
retrieving revision 1.2
diff -u -r1.2 e2k-freebusy.c
--- lib/e2k-freebusy.c 22 Jun 2004 15:21:59 -0000 1.2
+++ lib/e2k-freebusy.c 8 Dec 2005 13:13:06 -0000
@@ -32,7 +32,7 @@
#include <stdlib.h>
#include <string.h>
-#include <e-util/e-time-utils.h>
+#include <libedataserver/e-time-utils.h>
/**
* e2k_freebusy_destroy:
Index: lib/e2k-http-utils.c
===================================================================
RCS file: /cvs/gnome/evolution-exchange/lib/Attic/e2k-http-utils.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 e2k-http-utils.c
--- lib/e2k-http-utils.c 11 May 2004 15:15:58 -0000 1.1.1.1
+++ lib/e2k-http-utils.c 8 Dec 2005 13:13:06 -0000
@@ -23,7 +23,7 @@
#include "e2k-http-utils.h"
-#include <e-util/e-time-utils.h>
+#include <libedataserver/e-time-utils.h>
#include <ctype.h>
#include <stdlib.h>
Index: lib/e2k-utils.c
===================================================================
RCS file: /cvs/gnome/evolution-exchange/lib/Attic/e2k-utils.c,v
retrieving revision 1.3
diff -u -r1.3 e2k-utils.c
--- lib/e2k-utils.c 2 Jun 2004 19:11:12 -0000 1.3
+++ lib/e2k-utils.c 8 Dec 2005 13:13:07 -0000
@@ -26,7 +26,7 @@
#include "e2k-propnames.h"
#include "e2k-rule.h"
-#include <e-util/e-time-utils.h>
+#include <libedataserver/e-time-utils.h>
#include <ctype.h>
#include <stdlib.h>
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/ChangeLog,v
retrieving revision 1.1522.2.7
diff -u -r1.1522.2.7 ChangeLog
--- ChangeLog 5 Dec 2005 10:56:44 -0000 1.1522.2.7
+++ ChangeLog 8 Dec 2005 13:52:30 -0000
@@ -1,3 +1,8 @@
+2005-12-08 Irene Huang <Irene Huang sun com>
+
+ * plugins/itip-formatter/itip-view.c: Change #include
+ <e-util/e-time-utils.h> to #include <libedataserver/e-time-utils.h>
+
2005-12-05 Harish Krishnaswamy <kharish novell com>
* configure.in, NEWS : Release updates.
Index: ./plugins/itip-formatter/itip-view.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/itip-formatter/itip-view.c,v
retrieving revision 1.17.2.1
diff -u -r1.17.2.1 itip-view.c
--- ./plugins/itip-formatter/itip-view.c 19 Sep 2005 07:00:43 -0000 1.17.2.1
+++ ./plugins/itip-formatter/itip-view.c 8 Dec 2005 13:52:30 -0000
@@ -42,7 +42,7 @@
#include <mail/em-format-html.h>
#include <e-util/e-account-list.h>
#include <e-util/e-icon-factory.h>
-#include <e-util/e-time-utils.h>
+#include <libedataserver/e-time-utils.h>
#include <e-util/e-gtk-utils.h>
#include <e-util/e-util.h>
#include <calendar/gui/itip-utils.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"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
