diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | camel/ChangeLog | 5 | ||||
| -rw-r--r-- | camel/Makefile.am | 52 | ||||
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | doc/devel/calendar/cal-util/evolution-cal-util-decl.txt | 68 |
5 files changed, 64 insertions, 68 deletions
@@ -1,3 +1,7 @@ +2001-09-14 JP Rosevear <jpr@ximian.com> + + * configure.in: remove unneeded conditionals + 2001-09-13 Yanko Kaneti <yaneti@declera.com> * configure.in (ALL_LINGUAS): Added bg to ALL_LINGUAS. diff --git a/camel/ChangeLog b/camel/ChangeLog index c5b5f3467f..fbb1054370 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,8 @@ +2001-09-14 JP Rosevear <jpr@ximian.com> + + * Makefile.am: use install hook instead of install rule to + guarantee we run after installation + 2001-09-13 Jeffrey Stedfast <fejj@ximian.com> * camel-filter-driver.c (camel_filter_driver_filter_folder): Don't diff --git a/camel/Makefile.am b/camel/Makefile.am index 5cb85553f3..ee2e88f255 100644 --- a/camel/Makefile.am +++ b/camel/Makefile.am @@ -208,35 +208,33 @@ libcamel_static_la_LDFLAGS = --all-static camel-lock-helper: camel-lock-helper.o camel-lock.o $(CC) -o $@ $^ -I$(srcdir)/.. -I$(srcdir) -if CAMEL_LOCK_HELPER_SETUID -install-exec-local: - @if test `whoami` = root ; then \ - chown $(CAMEL_LOCK_HELPER_USER) $(DESTDIR)$(sbindir)/camel-lock-helper ; \ - chmod u+s $(DESTDIR)$(sbindir)/camel-lock-helper ; \ - else \ - echo '*** WARNING ***' ; \ - echo "Camel will not be able to open mbox files until you perform the following steps:" ; \ - echo " 1. Become root" ; \ - echo " 2. chown $(CAMEL_LOCK_HELPER_USER) $(DESTDIR)$(sbindir)/camel-lock-helper" ; \ - echo " 3. chmod u+s $(DESTDIR)$(sbindir)/camel-lock-helper" ; \ - echo '*** WARNING ***' ; \ +install-exec-hook: + @if test -n "$(CAMEL_LOCK_HELPER_USER)"; then \ + if test `whoami` = root ; then \ + chown $(CAMEL_LOCK_HELPER_USER) $(DESTDIR)$(sbindir)/camel-lock-helper ; \ + chmod u+s $(DESTDIR)$(sbindir)/camel-lock-helper ; \ + else \ + echo '*** WARNING ***' ; \ + echo "Camel will not be able to open mbox files until you perform the following steps:" ; \ + echo " 1. Become root" ; \ + echo " 2. chown $(CAMEL_LOCK_HELPER_USER) $(DESTDIR)$(sbindir)/camel-lock-helper" ; \ + echo " 3. chmod u+s $(DESTDIR)$(sbindir)/camel-lock-helper" ; \ + echo '*** WARNING ***' ; \ + fi \ fi -endif -if CAMEL_LOCK_HELPER_SETGID -install-exec-local: - @if test `whoami` = root ; then \ - chgrp $(CAMEL_LOCK_HELPER_GROUP) $(DESTDIR)$(sbindir)/camel-lock-helper ; \ - chmod g+s $(DESTDIR)$(sbindir)/camel-lock-helper ; \ - else \ - echo '*** WARNING ***' ; \ - echo "Camel will not be able to open mbox files until you perform the following steps:" ; \ - echo " 1. Become root" ; \ - echo " 2. chgrp $(CAMEL_LOCK_HELPER_GROUP) $(DESTDIR)$(sbindir)/camel-lock-helper" ; \ - echo " 3. chmod g+s $(DESTDIR)$(sbindir)/camel-lock-helper" ; \ - echo '*** WARNING ***' ; \ + @if test -n "$(CAMEL_LOCK_HELPER_GROUP)"; then \ + if test `whoami` = root ; then \ + chgrp $(CAMEL_LOCK_HELPER_GROUP) $(DESTDIR)$(sbindir)/camel-lock-helper ; \ + chmod g+s $(DESTDIR)$(sbindir)/camel-lock-helper ; \ + else \ + echo '*** WARNING ***' ; \ + echo "Camel will not be able to open mbox files until you perform the following steps:" ; \ + echo " 1. Become root" ; \ + echo " 2. chgrp $(CAMEL_LOCK_HELPER_GROUP) $(DESTDIR)$(sbindir)/camel-lock-helper" ; \ + echo " 3. chmod g+s $(DESTDIR)$(sbindir)/camel-lock-helper" ; \ + echo '*** WARNING ***' ; \ + fi \ fi -endif - noinst_HEADERS = \ camel-charset-map-private.h \ diff --git a/configure.in b/configure.in index 8bd5088a5b..47fc8cb6c8 100644 --- a/configure.in +++ b/configure.in @@ -176,9 +176,6 @@ AC_MSG_RESULT([$system_mail_dir, $system_mail_perm]) AC_SUBST(CAMEL_LOCK_HELPER_USER) AC_SUBST(CAMEL_LOCK_HELPER_GROUP) -AM_CONDITIONAL(CAMEL_LOCK_HELPER_SETUID, test -n "$CAMEL_LOCK_HELPER_USER") -AM_CONDITIONAL(CAMEL_LOCK_HELPER_SETGID, test -n "$CAMEL_LOCK_HELPER_GROUP") - dnl * Time zone stuff AC_CACHE_CHECK(for timezone variable, ac_cv_var_timezone, AC_TRY_COMPILE([ diff --git a/doc/devel/calendar/cal-util/evolution-cal-util-decl.txt b/doc/devel/calendar/cal-util/evolution-cal-util-decl.txt index 34164aba0e..608c328755 100644 --- a/doc/devel/calendar/cal-util/evolution-cal-util-decl.txt +++ b/doc/devel/calendar/cal-util/evolution-cal-util-decl.txt @@ -131,48 +131,15 @@ typedef enum { CAL_COMPONENT_TRANSP_UNKNOWN } CalComponentTransparency; </ENUM> -<ENUM> -<NAME>CalComponentCUType</NAME> -typedef enum { - CAL_COMPONENT_CUTYPE_INDIVIDUAL, - CAL_COMPONENT_CUTYPE_GROUP, - CAL_COMPONENT_CUTYPE_RESOURCE, - CAL_COMPONENT_CUTYPE_ROOM, - CAL_COMPONENT_CUTYPE_UNKNOWN -} CalComponentCUType; -</ENUM> -<ENUM> -<NAME>CalComponentRole</NAME> -typedef enum { - CAL_COMPONENT_ROLE_CHAIR, - CAL_COMPONENT_ROLE_REQUIRED, - CAL_COMPONENT_ROLE_OPTIONAL, - CAL_COMPONENT_ROLE_NON, - CAL_COMPONENT_ROLE_UNKNOWN -} CalComponentRole; -</ENUM> -<ENUM> -<NAME>CalComponentPartStat</NAME> -typedef enum { - CAL_COMPONENT_PARTSTAT_NEEDSACTION, - CAL_COMPONENT_PARTSTAT_ACCEPTED, - CAL_COMPONENT_PARTSTAT_DECLINED, - CAL_COMPONENT_PARTSTAT_TENTATIVE, - CAL_COMPONENT_PARTSTAT_DELEGATED, - CAL_COMPONENT_PARTSTAT_COMPLETED, - CAL_COMPONENT_PARTSTAT_INPROCESS, - CAL_COMPONENT_PARTSTAT_UNKNOWN -} CalComponentPartStat; -</ENUM> <TYPEDEF> <NAME>CalComponentAttendee</NAME> typedef struct { const char *value; const char *member; - CalComponentCUType cutype; - CalComponentRole role; - CalComponentPartStat status; + icalparameter_cutype cutype; + icalparameter_role role; + icalparameter_partstat status; gboolean rsvp; const char *delto; @@ -320,6 +287,16 @@ CalComponent *comp, struct icaltimetype **t CalComponent *comp, struct icaltimetype *t </FUNCTION> <FUNCTION> +<NAME>cal_component_get_contact_list</NAME> +<RETURNS>void </RETURNS> +CalComponent *comp, GSList **text_list +</FUNCTION> +<FUNCTION> +<NAME>cal_component_set_contact_list</NAME> +<RETURNS>void </RETURNS> +CalComponent *comp, GSList *text_list +</FUNCTION> +<FUNCTION> <NAME>cal_component_get_created</NAME> <RETURNS>void </RETURNS> CalComponent *comp, struct icaltimetype **t @@ -775,12 +752,12 @@ CalComponentAlarm *alarm, CalAlarmAction action <FUNCTION> <NAME>cal_component_alarm_get_attach</NAME> <RETURNS>void </RETURNS> -CalComponentAlarm *alarm, struct icalattachtype **attach +CalComponentAlarm *alarm, icalattach **attach </FUNCTION> <FUNCTION> <NAME>cal_component_alarm_set_attach</NAME> <RETURNS>void </RETURNS> -CalComponentAlarm *alarm, struct icalattachtype *attach +CalComponentAlarm *alarm, icalattach *attach </FUNCTION> <FUNCTION> <NAME>cal_component_alarm_get_description</NAME> @@ -864,6 +841,21 @@ GList *list void </FUNCTION> <FUNCTION> +<NAME>cal_util_generate_alarms_for_comp</NAME> +<RETURNS>CalComponentAlarms *</RETURNS> +CalComponent *comp,time_t start,time_t end,CalRecurResolveTimezoneFn resolve_tzid,gpointer user_data +</FUNCTION> +<FUNCTION> +<NAME>cal_util_generate_alarms_for_list</NAME> +<RETURNS>int </RETURNS> +GList *comps,time_t start,time_t end,GSList **comp_alarms,CalRecurResolveTimezoneFn resolve_tzid,gpointer user_data +</FUNCTION> +<FUNCTION> +<NAME>cal_util_resolve_tzid</NAME> +<RETURNS>icaltimezone *</RETURNS> +const char *tzid, gpointer data +</FUNCTION> +<FUNCTION> <NAME>time_days_in_month</NAME> <RETURNS>int </RETURNS> int year, int month |