aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog4
-rw-r--r--addressbook/conduit/address-conduit.c5
-rw-r--r--configure.in1
-rw-r--r--doc/devel/calendar/cal-util/tmpl/evolution-cal-util-unused.sgml164
-rw-r--r--e-util/e-list-iterator.c2
-rw-r--r--help/devel/calendar/cal-util/tmpl/evolution-cal-util-unused.sgml164
6 files changed, 172 insertions, 168 deletions
diff --git a/ChangeLog b/ChangeLog
index c75be71794..07749fcd25 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-01-14 JP Rosevear <jpr@ximian.com>
+
+ * configure.in: remove old config message
+
2001-01-14 Damon Chaplin <damon@helixcode.com>
* tools/evolution-move-tasks: new script to move tasks from the
diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c
index bcb40f337e..ee6aa56541 100644
--- a/addressbook/conduit/address-conduit.c
+++ b/addressbook/conduit/address-conduit.c
@@ -479,7 +479,7 @@ ecard_from_remote_record(EAddrConduitContext *ctxt,
delivery.code = address.entry[entryZip];
string = e_card_delivery_address_to_string (&delivery);
- e_card_simple_set (simple, E_CARD_SIMPLE_FIELD_ADDRESS_HOME, string);
+ e_card_simple_set (simple, E_CARD_SIMPLE_FIELD_ADDRESS_BUSINESS, string);
g_free (string);
if (address.entry[entryAddress])
@@ -514,7 +514,8 @@ ecard_from_remote_record(EAddrConduitContext *ctxt,
e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_PHONE_PAGER, phonenum);
else if (!strcmp (phonelabel, "Mobile"))
e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_PHONE_MOBILE, phonenum);
-
+ g_print (" ['%s' : '%s']\n", phonelabel, phonenum);
+
free (phonenum);
}
diff --git a/configure.in b/configure.in
index a4023268c6..8e53457b38 100644
--- a/configure.in
+++ b/configure.in
@@ -708,7 +708,6 @@ echo "
Use movemail: $with_movemail
Dot Locking: $msg_dot
File Locking: $msg_file
- Crypto support: $msg_crypto
Gtk-doc: $enable_gtk_doc"
if test x$enable_gtk_doc = xyes; then
diff --git a/doc/devel/calendar/cal-util/tmpl/evolution-cal-util-unused.sgml b/doc/devel/calendar/cal-util/tmpl/evolution-cal-util-unused.sgml
index ff68fae99d..93625da7df 100644
--- a/doc/devel/calendar/cal-util/tmpl/evolution-cal-util-unused.sgml
+++ b/doc/devel/calendar/cal-util/tmpl/evolution-cal-util-unused.sgml
@@ -1,44 +1,38 @@
-<!-- ##### ENUM CalComponentAlarmTriggerRelated ##### -->
-<para>
-
-</para>
-
-@CAL_COMPONENT_ALARM_TRIGGER_RELATED_START:
-@CAL_COMPONENT_ALARM_TRIGGER_RELATED_END:
-
-<!-- ##### FUNCTION cal_recur_free ##### -->
+<!-- ##### ENUM CalComponentAlarmAction ##### -->
<para>
</para>
-@r:
+@CAL_COMPONENT_ALARM_NONE:
+@CAL_COMPONENT_ALARM_AUDIO:
+@CAL_COMPONENT_ALARM_DISPLAY:
+@CAL_COMPONENT_ALARM_EMAIL:
+@CAL_COMPONENT_ALARM_PROCEDURE:
+@CAL_COMPONENT_ALARM_UNKNOWN:
-<!-- ##### ENUM CalRecurType ##### -->
+<!-- ##### FUNCTION time_from_isodate ##### -->
<para>
</para>
-@CAL_RECUR_YEARLY:
-@CAL_RECUR_MONTHLY:
-@CAL_RECUR_WEEKLY:
-@CAL_RECUR_DAILY:
-@CAL_RECUR_HOURLY:
-@CAL_RECUR_MINUTELY:
-@CAL_RECUR_SECONDLY:
+@str:
+@Returns:
-<!-- ##### TYPEDEF CalComponentAlarmTrigger ##### -->
+<!-- ##### FUNCTION cal_component_get_pilot_status ##### -->
<para>
</para>
+@comp:
+@pilot_status:
-<!-- ##### FUNCTION cal_component_get_pilot_id ##### -->
+<!-- ##### FUNCTION cal_recur_from_icalrecurrencetype ##### -->
<para>
</para>
-@comp:
-@pilot_id:
+@ir:
+@Returns:
<!-- ##### FUNCTION get_time_t_hour ##### -->
<para>
@@ -48,28 +42,29 @@
@t:
@Returns:
-<!-- ##### FUNCTION cal_component_alarm_free_trigger ##### -->
+<!-- ##### FUNCTION time_from_start_duration ##### -->
<para>
</para>
-@trigger: <!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../../../evolution-devel-guide.sgml" "book" "refsect2" "")
-End:
--->
+@start:
+@duration:
+@Returns:
-<!-- ##### FUNCTION time_day_hour ##### -->
+<!-- ##### ENUM CalRecurType ##### -->
<para>
</para>
-@t:
-@hour:
-@Returns:
+@CAL_RECUR_YEARLY:
+@CAL_RECUR_MONTHLY:
+@CAL_RECUR_WEEKLY:
+@CAL_RECUR_DAILY:
+@CAL_RECUR_HOURLY:
+@CAL_RECUR_MINUTELY:
+@CAL_RECUR_SECONDLY:
-<!-- ##### FUNCTION time_from_isodate ##### -->
+<!-- ##### FUNCTION parse_date ##### -->
<para>
</para>
@@ -77,113 +72,108 @@ End:
@str:
@Returns:
-<!-- ##### FUNCTION cal_component_get_pilot_status ##### -->
+<!-- ##### FUNCTION cal_component_get_pilot_id ##### -->
<para>
</para>
@comp:
-@pilot_status:
+@pilot_id:
-<!-- ##### STRUCT CalObjTime ##### -->
+<!-- ##### ENUM CalComponentAlarmTriggerRelated ##### -->
<para>
</para>
-@year:
-@month:
-@day:
-@hour:
-@minute:
-@second:
+@CAL_COMPONENT_ALARM_TRIGGER_RELATED_START:
+@CAL_COMPONENT_ALARM_TRIGGER_RELATED_END:
-<!-- ##### STRUCT CalComponentPrivate ##### -->
+<!-- ##### FUNCTION isodiff_to_secs ##### -->
<para>
</para>
+@str:
+@Returns:
-<!-- ##### ENUM CalComponentAlarmTriggerType ##### -->
+<!-- ##### FUNCTION cal_recur_free ##### -->
<para>
</para>
-@CAL_COMPONENT_ALARM_TRIGGER_RELATIVE:
-@CAL_COMPONENT_ALARM_TRIGGER_ABSOLUTE:
+@r:
-<!-- ##### FUNCTION cal_recur_from_icalrecurrencetype ##### -->
+<!-- ##### FUNCTION time_from_icaltimetype ##### -->
<para>
</para>
-@ir:
+@itt:
@Returns:
-<!-- ##### FUNCTION cal_alarm_instance_list_free ##### -->
+<!-- ##### FUNCTION time_day_hour ##### -->
<para>
</para>
-@list:
+@t:
+@hour:
+@Returns:
-<!-- ##### FUNCTION isodiff_to_secs ##### -->
+<!-- ##### FUNCTION cal_component_get_first_alarm ##### -->
<para>
</para>
-@str:
+@comp:
@Returns:
-<!-- ##### FUNCTION cal_component_get_first_alarm ##### -->
+<!-- ##### STRUCT CalComponentPrivate ##### -->
<para>
</para>
-@comp:
-@Returns:
-<!-- ##### TYPEDEF CalRecurrence ##### -->
+<!-- ##### FUNCTION isodiff_from_secs ##### -->
<para>
</para>
+@secs:
+@Returns:
-<!-- ##### FUNCTION cal_component_get_next_alarm ##### -->
+<!-- ##### FUNCTION cal_component_alarm_free_trigger ##### -->
<para>
</para>
-@comp:
-@Returns:
+@trigger: <!--
+Local variables:
+mode: sgml
+sgml-parent-document: ("../../../evolution-devel-guide.sgml" "book" "refsect2" "")
+End:
+-->
-<!-- ##### FUNCTION time_from_icaltimetype ##### -->
+<!-- ##### TYPEDEF CalRecurrence ##### -->
<para>
</para>
-@itt:
-@Returns:
-<!-- ##### ENUM CalComponentAlarmAction ##### -->
+<!-- ##### FUNCTION cal_alarm_instance_list_free ##### -->
<para>
</para>
-@CAL_COMPONENT_ALARM_NONE:
-@CAL_COMPONENT_ALARM_AUDIO:
-@CAL_COMPONENT_ALARM_DISPLAY:
-@CAL_COMPONENT_ALARM_EMAIL:
-@CAL_COMPONENT_ALARM_PROCEDURE:
-@CAL_COMPONENT_ALARM_UNKNOWN:
+@list:
-<!-- ##### FUNCTION time_from_start_duration ##### -->
+<!-- ##### FUNCTION cal_component_set_pilot_status ##### -->
<para>
</para>
-@start:
-@duration:
-@Returns:
+@comp:
+@pilot_status:
<!-- ##### FUNCTION cal_component_set_pilot_id ##### -->
<para>
@@ -193,13 +183,17 @@ End:
@comp:
@pilot_id:
-<!-- ##### FUNCTION isodiff_from_secs ##### -->
+<!-- ##### STRUCT CalObjTime ##### -->
<para>
</para>
-@secs:
-@Returns:
+@year:
+@month:
+@day:
+@hour:
+@minute:
+@second:
<!-- ##### FUNCTION format_simple_hour ##### -->
<para>
@@ -210,19 +204,25 @@ End:
@use_am_pm:
@Returns:
-<!-- ##### FUNCTION cal_component_set_pilot_status ##### -->
+<!-- ##### FUNCTION cal_component_get_next_alarm ##### -->
<para>
</para>
@comp:
-@pilot_status:
+@Returns:
-<!-- ##### FUNCTION parse_date ##### -->
+<!-- ##### ENUM CalComponentAlarmTriggerType ##### -->
+<para>
+
+</para>
+
+@CAL_COMPONENT_ALARM_TRIGGER_RELATIVE:
+@CAL_COMPONENT_ALARM_TRIGGER_ABSOLUTE:
+
+<!-- ##### TYPEDEF CalComponentAlarmTrigger ##### -->
<para>
</para>
-@str:
-@Returns:
diff --git a/e-util/e-list-iterator.c b/e-util/e-list-iterator.c
index 360e37ca40..d53a155cf8 100644
--- a/e-util/e-list-iterator.c
+++ b/e-util/e-list-iterator.c
@@ -34,7 +34,7 @@ static void e_list_iterator_destroy (GtkObject *object);
#define PARENT_TYPE (e_iterator_get_type ())
static GtkObjectClass *parent_class;
-#define PARENT_CLASS (E_LIST_ITERATOR_CLASS(parent_class))
+#define PARENT_CLASS (E_ITERATOR_CLASS(parent_class))
/**
* e_list_iterator_get_type:
diff --git a/help/devel/calendar/cal-util/tmpl/evolution-cal-util-unused.sgml b/help/devel/calendar/cal-util/tmpl/evolution-cal-util-unused.sgml
index ff68fae99d..93625da7df 100644
--- a/help/devel/calendar/cal-util/tmpl/evolution-cal-util-unused.sgml
+++ b/help/devel/calendar/cal-util/tmpl/evolution-cal-util-unused.sgml
@@ -1,44 +1,38 @@
-<!-- ##### ENUM CalComponentAlarmTriggerRelated ##### -->
-<para>
-
-</para>
-
-@CAL_COMPONENT_ALARM_TRIGGER_RELATED_START:
-@CAL_COMPONENT_ALARM_TRIGGER_RELATED_END:
-
-<!-- ##### FUNCTION cal_recur_free ##### -->
+<!-- ##### ENUM CalComponentAlarmAction ##### -->
<para>
</para>
-@r:
+@CAL_COMPONENT_ALARM_NONE:
+@CAL_COMPONENT_ALARM_AUDIO:
+@CAL_COMPONENT_ALARM_DISPLAY:
+@CAL_COMPONENT_ALARM_EMAIL:
+@CAL_COMPONENT_ALARM_PROCEDURE:
+@CAL_COMPONENT_ALARM_UNKNOWN:
-<!-- ##### ENUM CalRecurType ##### -->
+<!-- ##### FUNCTION time_from_isodate ##### -->
<para>
</para>
-@CAL_RECUR_YEARLY:
-@CAL_RECUR_MONTHLY:
-@CAL_RECUR_WEEKLY:
-@CAL_RECUR_DAILY:
-@CAL_RECUR_HOURLY:
-@CAL_RECUR_MINUTELY:
-@CAL_RECUR_SECONDLY:
+@str:
+@Returns:
-<!-- ##### TYPEDEF CalComponentAlarmTrigger ##### -->
+<!-- ##### FUNCTION cal_component_get_pilot_status ##### -->
<para>
</para>
+@comp:
+@pilot_status:
-<!-- ##### FUNCTION cal_component_get_pilot_id ##### -->
+<!-- ##### FUNCTION cal_recur_from_icalrecurrencetype ##### -->
<para>
</para>
-@comp:
-@pilot_id:
+@ir:
+@Returns:
<!-- ##### FUNCTION get_time_t_hour ##### -->
<para>
@@ -48,28 +42,29 @@
@t:
@Returns:
-<!-- ##### FUNCTION cal_component_alarm_free_trigger ##### -->
+<!-- ##### FUNCTION time_from_start_duration ##### -->
<para>
</para>
-@trigger: <!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../../../evolution-devel-guide.sgml" "book" "refsect2" "")
-End:
--->
+@start:
+@duration:
+@Returns:
-<!-- ##### FUNCTION time_day_hour ##### -->
+<!-- ##### ENUM CalRecurType ##### -->
<para>
</para>
-@t:
-@hour:
-@Returns:
+@CAL_RECUR_YEARLY:
+@CAL_RECUR_MONTHLY:
+@CAL_RECUR_WEEKLY:
+@CAL_RECUR_DAILY:
+@CAL_RECUR_HOURLY:
+@CAL_RECUR_MINUTELY:
+@CAL_RECUR_SECONDLY:
-<!-- ##### FUNCTION time_from_isodate ##### -->
+<!-- ##### FUNCTION parse_date ##### -->
<para>
</para>
@@ -77,113 +72,108 @@ End:
@str:
@Returns:
-<!-- ##### FUNCTION cal_component_get_pilot_status ##### -->
+<!-- ##### FUNCTION cal_component_get_pilot_id ##### -->
<para>
</para>
@comp:
-@pilot_status:
+@pilot_id:
-<!-- ##### STRUCT CalObjTime ##### -->
+<!-- ##### ENUM CalComponentAlarmTriggerRelated ##### -->
<para>
</para>
-@year:
-@month:
-@day:
-@hour:
-@minute:
-@second:
+@CAL_COMPONENT_ALARM_TRIGGER_RELATED_START:
+@CAL_COMPONENT_ALARM_TRIGGER_RELATED_END:
-<!-- ##### STRUCT CalComponentPrivate ##### -->
+<!-- ##### FUNCTION isodiff_to_secs ##### -->
<para>
</para>
+@str:
+@Returns:
-<!-- ##### ENUM CalComponentAlarmTriggerType ##### -->
+<!-- ##### FUNCTION cal_recur_free ##### -->
<para>
</para>
-@CAL_COMPONENT_ALARM_TRIGGER_RELATIVE:
-@CAL_COMPONENT_ALARM_TRIGGER_ABSOLUTE:
+@r:
-<!-- ##### FUNCTION cal_recur_from_icalrecurrencetype ##### -->
+<!-- ##### FUNCTION time_from_icaltimetype ##### -->
<para>
</para>
-@ir:
+@itt:
@Returns:
-<!-- ##### FUNCTION cal_alarm_instance_list_free ##### -->
+<!-- ##### FUNCTION time_day_hour ##### -->
<para>
</para>
-@list:
+@t:
+@hour:
+@Returns:
-<!-- ##### FUNCTION isodiff_to_secs ##### -->
+<!-- ##### FUNCTION cal_component_get_first_alarm ##### -->
<para>
</para>
-@str:
+@comp:
@Returns:
-<!-- ##### FUNCTION cal_component_get_first_alarm ##### -->
+<!-- ##### STRUCT CalComponentPrivate ##### -->
<para>
</para>
-@comp:
-@Returns:
-<!-- ##### TYPEDEF CalRecurrence ##### -->
+<!-- ##### FUNCTION isodiff_from_secs ##### -->
<para>
</para>
+@secs:
+@Returns:
-<!-- ##### FUNCTION cal_component_get_next_alarm ##### -->
+<!-- ##### FUNCTION cal_component_alarm_free_trigger ##### -->
<para>
</para>
-@comp:
-@Returns:
+@trigger: <!--
+Local variables:
+mode: sgml
+sgml-parent-document: ("../../../evolution-devel-guide.sgml" "book" "refsect2" "")
+End:
+-->
-<!-- ##### FUNCTION time_from_icaltimetype ##### -->
+<!-- ##### TYPEDEF CalRecurrence ##### -->
<para>
</para>
-@itt:
-@Returns:
-<!-- ##### ENUM CalComponentAlarmAction ##### -->
+<!-- ##### FUNCTION cal_alarm_instance_list_free ##### -->
<para>
</para>
-@CAL_COMPONENT_ALARM_NONE:
-@CAL_COMPONENT_ALARM_AUDIO:
-@CAL_COMPONENT_ALARM_DISPLAY:
-@CAL_COMPONENT_ALARM_EMAIL:
-@CAL_COMPONENT_ALARM_PROCEDURE:
-@CAL_COMPONENT_ALARM_UNKNOWN:
+@list:
-<!-- ##### FUNCTION time_from_start_duration ##### -->
+<!-- ##### FUNCTION cal_component_set_pilot_status ##### -->
<para>
</para>
-@start:
-@duration:
-@Returns:
+@comp:
+@pilot_status:
<!-- ##### FUNCTION cal_component_set_pilot_id ##### -->
<para>
@@ -193,13 +183,17 @@ End:
@comp:
@pilot_id:
-<!-- ##### FUNCTION isodiff_from_secs ##### -->
+<!-- ##### STRUCT CalObjTime ##### -->
<para>
</para>
-@secs:
-@Returns:
+@year:
+@month:
+@day:
+@hour:
+@minute:
+@second:
<!-- ##### FUNCTION format_simple_hour ##### -->
<para>
@@ -210,19 +204,25 @@ End:
@use_am_pm:
@Returns:
-<!-- ##### FUNCTION cal_component_set_pilot_status ##### -->
+<!-- ##### FUNCTION cal_component_get_next_alarm ##### -->
<para>
</para>
@comp:
-@pilot_status:
+@Returns:
-<!-- ##### FUNCTION parse_date ##### -->
+<!-- ##### ENUM CalComponentAlarmTriggerType ##### -->
+<para>
+
+</para>
+
+@CAL_COMPONENT_ALARM_TRIGGER_RELATIVE:
+@CAL_COMPONENT_ALARM_TRIGGER_ABSOLUTE:
+
+<!-- ##### TYPEDEF CalComponentAlarmTrigger ##### -->
<para>
</para>
-@str:
-@Returns:
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 15:36:40 +0800