diff --git a/ChangeLog b/ChangeLog index c75be71794..07749fcd25 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2001-01-14 JP Rosevear + + * configure.in: remove old config message + 2001-01-14 Damon Chaplin * 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,73 +1,14 @@ - + -@CAL_COMPONENT_ALARM_TRIGGER_RELATED_START: -@CAL_COMPONENT_ALARM_TRIGGER_RELATED_END: - - - - - - -@r: - - - - - - -@CAL_RECUR_YEARLY: -@CAL_RECUR_MONTHLY: -@CAL_RECUR_WEEKLY: -@CAL_RECUR_DAILY: -@CAL_RECUR_HOURLY: -@CAL_RECUR_MINUTELY: -@CAL_RECUR_SECONDLY: - - - - - - - - - - - - -@comp: -@pilot_id: - - - - - - -@t: -@Returns: - - - - - - -@trigger: - - - - - - -@t: -@hour: -@Returns: +@CAL_COMPONENT_ALARM_NONE: +@CAL_COMPONENT_ALARM_AUDIO: +@CAL_COMPONENT_ALARM_DISPLAY: +@CAL_COMPONENT_ALARM_EMAIL: +@CAL_COMPONENT_ALARM_PROCEDURE: +@CAL_COMPONENT_ALARM_UNKNOWN: @@ -85,6 +26,163 @@ End: @comp: @pilot_status: + + + + + +@ir: +@Returns: + + + + + + +@t: +@Returns: + + + + + + +@start: +@duration: +@Returns: + + + + + + +@CAL_RECUR_YEARLY: +@CAL_RECUR_MONTHLY: +@CAL_RECUR_WEEKLY: +@CAL_RECUR_DAILY: +@CAL_RECUR_HOURLY: +@CAL_RECUR_MINUTELY: +@CAL_RECUR_SECONDLY: + + + + + + +@str: +@Returns: + + + + + + +@comp: +@pilot_id: + + + + + + +@CAL_COMPONENT_ALARM_TRIGGER_RELATED_START: +@CAL_COMPONENT_ALARM_TRIGGER_RELATED_END: + + + + + + +@str: +@Returns: + + + + + + +@r: + + + + + + +@itt: +@Returns: + + + + + + +@t: +@hour: +@Returns: + + + + + + +@comp: +@Returns: + + + + + + + + + + + + +@secs: +@Returns: + + + + + + +@trigger: + + + + + + + + + + + + +@list: + + + + + + +@comp: +@pilot_status: + + + + + + +@comp: +@pilot_id: + @@ -97,110 +195,6 @@ End: @minute: @second: - - - - - - - - - - - -@CAL_COMPONENT_ALARM_TRIGGER_RELATIVE: -@CAL_COMPONENT_ALARM_TRIGGER_ABSOLUTE: - - - - - - -@ir: -@Returns: - - - - - - -@list: - - - - - - -@str: -@Returns: - - - - - - -@comp: -@Returns: - - - - - - - - - - - - -@comp: -@Returns: - - - - - - -@itt: -@Returns: - - - - - - -@CAL_COMPONENT_ALARM_NONE: -@CAL_COMPONENT_ALARM_AUDIO: -@CAL_COMPONENT_ALARM_DISPLAY: -@CAL_COMPONENT_ALARM_EMAIL: -@CAL_COMPONENT_ALARM_PROCEDURE: -@CAL_COMPONENT_ALARM_UNKNOWN: - - - - - - -@start: -@duration: -@Returns: - - - - - - -@comp: -@pilot_id: - - - - - - -@secs: -@Returns: - @@ -210,19 +204,25 @@ End: @use_am_pm: @Returns: - + @comp: -@pilot_status: +@Returns: - + + + + + +@CAL_COMPONENT_ALARM_TRIGGER_RELATIVE: +@CAL_COMPONENT_ALARM_TRIGGER_ABSOLUTE: + + -@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,73 +1,14 @@ - + -@CAL_COMPONENT_ALARM_TRIGGER_RELATED_START: -@CAL_COMPONENT_ALARM_TRIGGER_RELATED_END: - - - - - - -@r: - - - - - - -@CAL_RECUR_YEARLY: -@CAL_RECUR_MONTHLY: -@CAL_RECUR_WEEKLY: -@CAL_RECUR_DAILY: -@CAL_RECUR_HOURLY: -@CAL_RECUR_MINUTELY: -@CAL_RECUR_SECONDLY: - - - - - - - - - - - - -@comp: -@pilot_id: - - - - - - -@t: -@Returns: - - - - - - -@trigger: - - - - - - -@t: -@hour: -@Returns: +@CAL_COMPONENT_ALARM_NONE: +@CAL_COMPONENT_ALARM_AUDIO: +@CAL_COMPONENT_ALARM_DISPLAY: +@CAL_COMPONENT_ALARM_EMAIL: +@CAL_COMPONENT_ALARM_PROCEDURE: +@CAL_COMPONENT_ALARM_UNKNOWN: @@ -85,6 +26,163 @@ End: @comp: @pilot_status: + + + + + +@ir: +@Returns: + + + + + + +@t: +@Returns: + + + + + + +@start: +@duration: +@Returns: + + + + + + +@CAL_RECUR_YEARLY: +@CAL_RECUR_MONTHLY: +@CAL_RECUR_WEEKLY: +@CAL_RECUR_DAILY: +@CAL_RECUR_HOURLY: +@CAL_RECUR_MINUTELY: +@CAL_RECUR_SECONDLY: + + + + + + +@str: +@Returns: + + + + + + +@comp: +@pilot_id: + + + + + + +@CAL_COMPONENT_ALARM_TRIGGER_RELATED_START: +@CAL_COMPONENT_ALARM_TRIGGER_RELATED_END: + + + + + + +@str: +@Returns: + + + + + + +@r: + + + + + + +@itt: +@Returns: + + + + + + +@t: +@hour: +@Returns: + + + + + + +@comp: +@Returns: + + + + + + + + + + + + +@secs: +@Returns: + + + + + + +@trigger: + + + + + + + + + + + + +@list: + + + + + + +@comp: +@pilot_status: + + + + + + +@comp: +@pilot_id: + @@ -97,110 +195,6 @@ End: @minute: @second: - - - - - - - - - - - -@CAL_COMPONENT_ALARM_TRIGGER_RELATIVE: -@CAL_COMPONENT_ALARM_TRIGGER_ABSOLUTE: - - - - - - -@ir: -@Returns: - - - - - - -@list: - - - - - - -@str: -@Returns: - - - - - - -@comp: -@Returns: - - - - - - - - - - - - -@comp: -@Returns: - - - - - - -@itt: -@Returns: - - - - - - -@CAL_COMPONENT_ALARM_NONE: -@CAL_COMPONENT_ALARM_AUDIO: -@CAL_COMPONENT_ALARM_DISPLAY: -@CAL_COMPONENT_ALARM_EMAIL: -@CAL_COMPONENT_ALARM_PROCEDURE: -@CAL_COMPONENT_ALARM_UNKNOWN: - - - - - - -@start: -@duration: -@Returns: - - - - - - -@comp: -@pilot_id: - - - - - - -@secs: -@Returns: - @@ -210,19 +204,25 @@ End: @use_am_pm: @Returns: - + @comp: -@pilot_status: +@Returns: - + + + + + +@CAL_COMPONENT_ALARM_TRIGGER_RELATIVE: +@CAL_COMPONENT_ALARM_TRIGGER_ABSOLUTE: + + -@str: -@Returns: