From 0f6c6bbb8cb76ba673a10b11407100d02919be04 Mon Sep 17 00:00:00 2001 From: JP Rosevear Date: Thu, 12 Apr 2001 18:44:41 +0000 Subject: put the business address into the pilot record as that is what we put into 2001-04-12 JP Rosevear * conduit/address-conduit.c (local_record_from_ecard): put the business address into the pilot record as that is what we put into the desktop record (ecard_from_remote_record): set both the address label and delivery address to avoid bad parser guessing, fixes #2143 * backend/ebook/e-card-types.h: remove deprecated pilot code * backend/ebook/e-card.c: ditto * backend/ebook/e-card.h: ditto svn path=/trunk/; revision=9279 --- addressbook/backend/ebook/e-card-types.h | 8 ----- addressbook/backend/ebook/e-card.c | 60 -------------------------------- addressbook/backend/ebook/e-card.h | 2 -- 3 files changed, 70 deletions(-) (limited to 'addressbook/backend') diff --git a/addressbook/backend/ebook/e-card-types.h b/addressbook/backend/ebook/e-card-types.h index a2563d4bf6..57aed690aa 100644 --- a/addressbook/backend/ebook/e-card-types.h +++ b/addressbook/backend/ebook/e-card-types.h @@ -86,12 +86,4 @@ typedef struct { char *value; } ECardArbitrary; -/* PILOT SYNC STATUS */ - -enum { - E_CARD_PILOT_STATUS_NONE, - E_CARD_PILOT_STATUS_MOD, - E_CARD_PILOT_STATUS_DEL -}; - #endif /* __E_CARD_TYPES_H__ */ diff --git a/addressbook/backend/ebook/e-card.c b/addressbook/backend/ebook/e-card.c index 435d8fef51..ca160f0905 100644 --- a/addressbook/backend/ebook/e-card.c +++ b/addressbook/backend/ebook/e-card.c @@ -29,8 +29,6 @@ #define str_val(obj) (the_str = (vObjectValueType (obj))? fakeCString (vObjectUStringZValue (obj)) : calloc (1, 1)) #define has(obj,prop) (vo = isAPropertyOf ((obj), (prop))) -#define XEV_PILOT_ID "X-EVOLUTION-PILOTID" -#define XEV_PILOT_STATUS "X-EVOLUTION-PILOTSTATUS" #define XEV_WANTS_HTML "X-MOZILLA-HTML" #define XEV_ARBITRARY "X-EVOLUTION-ARBITRARY" @@ -63,8 +61,6 @@ enum { ARG_CATEGORY_LIST, ARG_WANTS_HTML, ARG_WANTS_HTML_SET, - ARG_PILOTID, - ARG_PILOTSTATUS, ARG_ARBITRARY, ARG_ID, }; @@ -108,8 +104,6 @@ static void parse_fburl(ECard *card, VObject *object); static void parse_note(ECard *card, VObject *object); static void parse_categories(ECard *card, VObject *object); static void parse_wants_html(ECard *card, VObject *object); -static void parse_pilot_id(ECard *card, VObject *object); -static void parse_pilot_status(ECard *card, VObject *object); static void parse_arbitrary(ECard *card, VObject *object); static void parse_id(ECard *card, VObject *object); @@ -148,8 +142,6 @@ struct { { VCNoteProp, parse_note }, { "CATEGORIES", parse_categories }, { XEV_WANTS_HTML, parse_wants_html }, - { XEV_PILOT_ID, parse_pilot_id }, - { XEV_PILOT_STATUS, parse_pilot_status }, { XEV_ARBITRARY, parse_arbitrary }, { VCUniqueStringProp, parse_id } }; @@ -459,20 +451,6 @@ char addPropValue (vobj, XEV_WANTS_HTML, card->wants_html ? "TRUE" : "FALSE"); } - if (card->pilot_id) { - gchar *pilotid_str; - pilotid_str = g_strdup_printf ("%d", card->pilot_id); - addPropValue (vobj, XEV_PILOT_ID, pilotid_str); - g_free (pilotid_str); - } - - if (card->pilot_status) { - gchar *pilotstatus_str; - pilotstatus_str = g_strdup_printf ("%d", card->pilot_status); - addPropValue (vobj, XEV_PILOT_STATUS, pilotstatus_str); - g_free (pilotstatus_str); - } - if (card->arbitrary) { EIterator *iterator; for (iterator = e_list_get_iterator(card->arbitrary); e_iterator_is_valid(iterator); e_iterator_next(iterator)) { @@ -880,26 +858,6 @@ parse_wants_html(ECard *card, VObject *vobj) } } -static void -parse_pilot_id(ECard *card, VObject *vobj) -{ - if ( vObjectValueType (vobj) ) { - char *str = fakeCString (vObjectUStringZValue (vobj)); - card->pilot_id = atoi(str); - free(str); - } -} - -static void -parse_pilot_status(ECard *card, VObject *vobj) -{ - if ( vObjectValueType (vobj) ) { - char *str = fakeCString (vObjectUStringZValue (vobj)); - card->pilot_status = atoi(str); - free(str); - } -} - typedef union ValueItem { const char *strs; const wchar_t *ustrs; @@ -1055,10 +1013,6 @@ e_card_class_init (ECardClass *klass) GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_WANTS_HTML); gtk_object_add_arg_type ("ECard::wants_html_set", GTK_TYPE_BOOL, GTK_ARG_READABLE, ARG_WANTS_HTML); - gtk_object_add_arg_type ("ECard::pilot_id", - GTK_TYPE_INT, GTK_ARG_READWRITE, ARG_PILOTID); - gtk_object_add_arg_type ("ECard::pilot_status", - GTK_TYPE_INT, GTK_ARG_READWRITE, ARG_PILOTSTATUS); gtk_object_add_arg_type ("ECard::arbitrary", GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_ARBITRARY); gtk_object_add_arg_type ("ECard::id", @@ -1743,12 +1697,6 @@ e_card_set_arg (GtkObject *object, GtkArg *arg, guint arg_id) card->wants_html = GTK_VALUE_BOOL(*arg); card->wants_html_set = TRUE; break; - case ARG_PILOTID: - card->pilot_id = GTK_VALUE_INT(*arg); - break; - case ARG_PILOTSTATUS: - card->pilot_status = GTK_VALUE_INT(*arg); - break; case ARG_ARBITRARY: if (card->arbitrary) gtk_object_unref(GTK_OBJECT(card->arbitrary)); @@ -1889,12 +1837,6 @@ e_card_get_arg (GtkObject *object, GtkArg *arg, guint arg_id) case ARG_WANTS_HTML_SET: GTK_VALUE_BOOL(*arg) = card->wants_html_set; break; - case ARG_PILOTID: - GTK_VALUE_INT(*arg) = card->pilot_id; - break; - case ARG_PILOTSTATUS: - GTK_VALUE_INT(*arg) = card->pilot_status; - break; case ARG_ARBITRARY: if (!card->arbitrary) card->arbitrary = e_list_new((EListCopyFunc) e_card_arbitrary_copy, @@ -1946,8 +1888,6 @@ e_card_init (ECard *card) card->categories = NULL; card->wants_html = FALSE; card->wants_html_set = FALSE; - card->pilot_id = 0; - card->pilot_status = 0; card->arbitrary = NULL; #if 0 diff --git a/addressbook/backend/ebook/e-card.h b/addressbook/backend/ebook/e-card.h index 5c0865ab50..90d345b62c 100644 --- a/addressbook/backend/ebook/e-card.h +++ b/addressbook/backend/ebook/e-card.h @@ -74,8 +74,6 @@ struct _ECard { guint32 wants_html : 1; /* Wants html mail. */ guint32 wants_html_set : 1; /* Wants html mail. */ - guint32 pilot_id; /* id of the corresponding pilot */ - guint32 pilot_status; /* status information */ #if 0 ECardPhoto *logo; /* This person's org's logo. */ -- cgit v1.2.3