From 2d75a701029288c953a84ba0a696675f5a7eb77f Mon Sep 17 00:00:00 2001 From: Christopher James Lahey Date: Tue, 4 Apr 2000 19:30:28 +0000 Subject: Fixed an incorrect function. 2000-04-04 Christopher James Lahey * addressbook/backend/ebook/e-book-view.c: Fixed an incorrect function. * addressbook/backend/ebook/e-book-view.h, addressbook/backend/ebook/e-book.h: Fixed some incorrect function pointer declarations. * addressbook/backend/ebook/e-card-iterator.c, addressbook/backend/ebook/e-card-iterator.h, addressbook/backend/ebook/e-card-list-iterator.c, addressbook/backend/ebook/e-card-list-iterator.h, addressbook/backend/ebook/e-card-list.c, addressbook/backend/ebook/e-card-list.h, addressbook/backend/ebook/e-card.c, addressbook/backend/ebook/e-card.h, addressbook/backend/ebook/test-card.c: Built new iterator system for getting fields with multiple entries. * addressbook/backend/ebook/Makefile.am: Added new files addressbook/backend/ebook/e-card-iterator.c, addressbook/backend/ebook/e-card-iterator.h, addressbook/backend/ebook/e-card-list-iterator.c, addressbook/backend/ebook/e-card-list-iterator.h, addressbook/backend/ebook/e-card-list.c, and addressbook/backend/ebook/e-card-list.h. svn path=/trunk/; revision=2286 --- addressbook/backend/ebook/test-card.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) (limited to 'addressbook/backend/ebook/test-card.c') diff --git a/addressbook/backend/ebook/test-card.c b/addressbook/backend/ebook/test-card.c index d032dfe707..70ced1a8d5 100644 --- a/addressbook/backend/ebook/test-card.c +++ b/addressbook/backend/ebook/test-card.c @@ -61,9 +61,10 @@ main (int argc, char **argv) /* Fields */ char *fname; ECardName *name; - GList *address; - GList *phone; - GList *email; + ECardList *address; + ECardList *phone; + ECardList *email; + ECardIterator *iterator; ECardDate *bday; gnome_init ("TestCard", "0.0", argc, argv); @@ -114,19 +115,24 @@ main (int argc, char **argv) printf("BDay : %4d-%02d-%02d\n", bday->year, bday->month, bday->day); } if ( email ) { - for ( ; email; email = email->next ) { - printf("Email : %s\n", (char *) email->data); + iterator = e_card_list_get_iterator(address); + for (; e_card_iterator_is_valid(iterator); e_card_iterator_next(iterator)) { + printf("Email : %s\n", (char *) e_card_iterator_get(iterator)); } + gtk_object_unref(GTK_OBJECT(iterator)); } if ( phone ) { - for ( ; phone; phone = phone->next ) { - ECardPhone *e_card_phone = (ECardPhone *) phone->data; + iterator = e_card_list_get_iterator(address); + for (; e_card_iterator_is_valid(iterator); e_card_iterator_next(iterator)) { + ECardPhone *e_card_phone = (ECardPhone *) e_card_iterator_get(iterator); printf("Phone ; %d : %s\n", e_card_phone->flags, e_card_phone->number); } + gtk_object_unref(GTK_OBJECT(iterator)); } if ( address ) { - for ( ; address; address = address->next ) { - ECardDeliveryAddress *del_address = (ECardDeliveryAddress *) address->data; + iterator = e_card_list_get_iterator(address); + for (; e_card_iterator_is_valid(iterator); e_card_iterator_next(iterator)) { + ECardDeliveryAddress *del_address = (ECardDeliveryAddress *) e_card_iterator_get(iterator); printf("Address ; %d:\n", del_address->flags); if ( del_address->po ) printf(" Po : %s\n", del_address->po); @@ -143,6 +149,7 @@ main (int argc, char **argv) if ( del_address->country ) printf(" Country : %s\n", del_address->country); } + gtk_object_unref(GTK_OBJECT(iterator)); } printf("%s", e_card_get_vcard(card)); gtk_object_unref (GTK_OBJECT (card)); -- cgit v1.2.3