diff options
Diffstat (limited to 'my-evolution')
-rw-r--r-- | my-evolution/ChangeLog | 21 | ||||
-rw-r--r-- | my-evolution/Makefile.am | 3 | ||||
-rw-r--r-- | my-evolution/e-summary-calendar.c | 2 | ||||
-rw-r--r-- | my-evolution/e-summary.h | 2 |
4 files changed, 18 insertions, 10 deletions
diff --git a/my-evolution/ChangeLog b/my-evolution/ChangeLog index e3c7b0c1fd..6f24d9b0d4 100644 --- a/my-evolution/ChangeLog +++ b/my-evolution/ChangeLog @@ -1,3 +1,12 @@ +2003-10-09 Jeffrey Stedfast <fejj@ximian.com> + + * Makefile.am: INCLUDE path fixes for changes made to libical + build. + + * e-summary-calendar.h: #include <libical/ical.h> + + * e-summary.h: #include <libical/ical.h> + 2003-09-08 Calvin Liu <calvin.liu@sun.com> ** For bug #48175 @@ -20,12 +29,12 @@ [Fixed bug #47563] - * e-summary-tasks.c (setup_task_folder) : set a default value for the - tasks->due_today_colour and tasks->overdue_colour, if the key in gconf - is NULL. and change the key name from TasksDueTodayi to due_today, from - TasksOverdue to overdue, in order to coincide with the key in - e-summary-tasks.c(setup_task_folder).In this way, it can avoid crash - on solaris. + * e-summary-tasks.c (setup_task_folder) : set a default value for + the tasks->due_today_colour and tasks->overdue_colour, if the key + in gconf is NULL. and change the key name from TasksDueTodayi to + due_today, from TasksOverdue to overdue, in order to coincide with + the key in e-summary-tasks.c (setup_task_folder).In this way, it + can avoid crash on solaris. 2003-08-11 Ettore Perazzoli <ettore@ximian.com> diff --git a/my-evolution/Makefile.am b/my-evolution/Makefile.am index 3bb6fd91a4..0e727d62b2 100644 --- a/my-evolution/Makefile.am +++ b/my-evolution/Makefile.am @@ -4,8 +4,7 @@ INCLUDES = \ -I$(top_builddir)/shell \ -I$(top_srcdir)/calendar \ -I$(top_builddir)/calendar/cal-client \ - -I$(top_srcdir)/libical/src/libical \ - -I$(top_builddir)/libical/src/libical \ + -I$(top_srcdir)/libical/src \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ -DEVOLUTION_DATADIR=\""$(datadir)"\" \ -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \ diff --git a/my-evolution/e-summary-calendar.c b/my-evolution/e-summary-calendar.c index 8e6b2f972e..dbc2472b9e 100644 --- a/my-evolution/e-summary-calendar.c +++ b/my-evolution/e-summary-calendar.c @@ -38,7 +38,7 @@ #include <gconf/gconf-client.h> -#include <ical.h> +#include <libical/ical.h> #define MAX_RELOAD_TRIES 10 diff --git a/my-evolution/e-summary.h b/my-evolution/e-summary.h index 5700284776..05bc6fb9bb 100644 --- a/my-evolution/e-summary.h +++ b/my-evolution/e-summary.h @@ -33,7 +33,7 @@ #include "e-summary-weather.h" #include "e-summary-tasks.h" -#include <ical.h> +#include <libical/ical.h> #include <Evolution.h> |