From 934ad3b159ee6663ad243aed0df7089f8d8de483 Mon Sep 17 00:00:00 2001 From: Christopher James Lahey Date: Tue, 14 Aug 2001 05:56:12 +0000 Subject: Call e_card_set_book here. 2001-08-14 Christopher James Lahey * backend/ebook/e-book-view.c (add_book_iterator): Call e_card_set_book here. * backend/ebook/e-book.c (e_book_do_response_get_vcard): Call e_card_set_book here. * backend/ebook/e-card.c, backend/ebook/e-card.h: Pulled out the part where the uri is made part of the uid. Made uri a separate field. * backend/ebook/e-destination.c, backend/ebook/e-destination.h: Change this to use ECard's split uids and uris. svn path=/trunk/; revision=11991 --- addressbook/backend/ebook/e-card.h | 108 ++++++++++++++++++------------------- 1 file changed, 54 insertions(+), 54 deletions(-) (limited to 'addressbook/backend/ebook/e-card.h') diff --git a/addressbook/backend/ebook/e-card.h b/addressbook/backend/ebook/e-card.h index 83e074ff23..c870ae2978 100644 --- a/addressbook/backend/ebook/e-card.h +++ b/addressbook/backend/ebook/e-card.h @@ -34,7 +34,6 @@ struct _ECard { char *id; struct _EBook *book; /* The EBook this card is from. */ - gchar *uri; /* The card's uri (book uri + id) */ char *file_as; /* The File As field. */ char *fname; /* The full name. */ @@ -117,87 +116,88 @@ struct _ECardClass { /* Simple functions */ -ECard *e_card_new (char *vcard); -const char *e_card_get_id (ECard *card); -void e_card_set_id (ECard *card, - const char *character); - -struct _EBook *e_card_get_book (ECard *card); -const char *e_card_get_uri (ECard *card); - - -char *e_card_get_vcard (ECard *card); -char *e_card_list_get_vcard (GList *list); -ECard *e_card_duplicate (ECard *card); - -float e_card_get_use_score (ECard *card); -void e_card_touch (ECard *card); +ECard *e_card_new (char *vcard); +const char *e_card_get_id (ECard *card); +void e_card_set_id (ECard *card, + const char *character); + +struct _EBook *e_card_get_book (ECard *card); +void e_card_set_book (ECard *card, + struct _EBook *book); +char *e_card_get_vcard (ECard *card); +char *e_card_list_get_vcard (GList *list); +ECard *e_card_duplicate (ECard *card); +float e_card_get_use_score (ECard *card); +void e_card_touch (ECard *card); /* Evolution List convenience functions */ /* used for encoding uids in email addresses */ -gboolean e_card_evolution_list (ECard *card); -gboolean e_card_evolution_list_show_addresses(ECard *card); +gboolean e_card_evolution_list (ECard *card); +gboolean e_card_evolution_list_show_addresses (ECard *card); /* ECardPhone manipulation */ -ECardPhone *e_card_phone_new (void); -ECardPhone *e_card_phone_copy (const ECardPhone *phone); -void e_card_phone_free (ECardPhone *phone); +ECardPhone *e_card_phone_new (void); +ECardPhone *e_card_phone_copy (const ECardPhone *phone); +void e_card_phone_free (ECardPhone *phone); /* ECardDeliveryAddress manipulation */ -ECardDeliveryAddress *e_card_delivery_address_new (void); -ECardDeliveryAddress *e_card_delivery_address_copy (const ECardDeliveryAddress *addr); -void e_card_delivery_address_free (ECardDeliveryAddress *addr); -gboolean e_card_delivery_address_is_empty (const ECardDeliveryAddress *addr); -char *e_card_delivery_address_to_string (const ECardDeliveryAddress *addr); -ECardDeliveryAddress *e_card_delivery_address_from_label (const ECardAddrLabel *label); -ECardAddrLabel *e_card_delivery_address_to_label (const ECardDeliveryAddress *addr); +ECardDeliveryAddress *e_card_delivery_address_new (void); +ECardDeliveryAddress *e_card_delivery_address_copy (const ECardDeliveryAddress *addr); +void e_card_delivery_address_free (ECardDeliveryAddress *addr); +gboolean e_card_delivery_address_is_empty (const ECardDeliveryAddress *addr); +char *e_card_delivery_address_to_string (const ECardDeliveryAddress *addr); +ECardDeliveryAddress *e_card_delivery_address_from_label (const ECardAddrLabel *label); +ECardAddrLabel *e_card_delivery_address_to_label (const ECardDeliveryAddress *addr); /* ECardAddrLabel manipulation */ -ECardAddrLabel *e_card_address_label_new (void); -ECardAddrLabel *e_card_address_label_copy (const ECardAddrLabel *addr); -void e_card_address_label_free (ECardAddrLabel *addr); +ECardAddrLabel *e_card_address_label_new (void); +ECardAddrLabel *e_card_address_label_copy (const ECardAddrLabel *addr); +void e_card_address_label_free (ECardAddrLabel *addr); /* ECardName manipulation */ -ECardName *e_card_name_new (void); -ECardName *e_card_name_copy (const ECardName *name); -void e_card_name_free (ECardName *name); -char *e_card_name_to_string (const ECardName *name); -ECardName *e_card_name_from_string (const char *full_name); -gboolean e_card_name_match_string (const ECardName *name, - const gchar *str); +ECardName *e_card_name_new (void); +ECardName *e_card_name_copy (const ECardName *name); +void e_card_name_free (ECardName *name); +char *e_card_name_to_string (const ECardName *name); +ECardName *e_card_name_from_string (const char *full_name); +gboolean e_card_name_match_string (const ECardName *name, + const gchar *str); /* ECardArbitrary manipulation */ -ECardArbitrary *e_card_arbitrary_new (void); -ECardArbitrary *e_card_arbitrary_copy (const ECardArbitrary *arbitrary); -void e_card_arbitrary_free (ECardArbitrary *arbitrary); +ECardArbitrary *e_card_arbitrary_new (void); +ECardArbitrary *e_card_arbitrary_copy (const ECardArbitrary *arbitrary); +void e_card_arbitrary_free (ECardArbitrary *arbitrary); /* ECard email manipulation */ -gboolean e_card_email_match_string (const ECard *card, - const gchar *str); -gint e_card_email_find_number (const ECard *card, - const gchar *email); +gboolean e_card_email_match_string (const ECard *card, + const gchar *str); +gint e_card_email_find_number (const ECard *card, + const gchar *email); /* Specialized functionality */ -GList *e_card_load_cards_from_file (const char *filename); -GList *e_card_load_cards_from_string (const char *str); -void e_card_free_empty_lists (ECard *card); +GList *e_card_load_cards_from_file (const char *filename); +GList *e_card_load_cards_from_string (const char *str); +void e_card_free_empty_lists (ECard *card); enum _ECardDisposition { E_CARD_DISPOSITION_AS_ATTACHMENT, E_CARD_DISPOSITION_AS_TO, }; typedef enum _ECardDisposition ECardDisposition; -void e_card_send (ECard *card, - ECardDisposition disposition); -void e_card_list_send (GList *cards, - ECardDisposition disposition); +void e_card_send (ECard *card, + ECardDisposition disposition); +void e_card_list_send (GList *cards, + ECardDisposition disposition); /* Getting ECards via their URIs */ typedef void (*ECardCallback) (ECard *card, gpointer closure); -void e_card_load_uri (const gchar *uri, ECardCallback cb, gpointer closure); +void e_card_load_uri (const gchar *book_uri, + const gchar *uid, + ECardCallback cb, + gpointer closure); /* Standard Gtk function */ -GtkType e_card_get_type (void); +GtkType e_card_get_type (void); #endif /* ! __E_CARD_H__ */ -- cgit v1.2.3