Removed e-card-iterator.c, e-card-iterator.h, e-card-list-iterator.c,

2000-07-03  Christopher James Lahey  <clahey@helixcode.com>

	* backend/ebook/Makefile.am: Removed e-card-iterator.c,
	e-card-iterator.h, e-card-list-iterator.c, e-card-list-iterator.h,
	e-card-list.c, e-card-list.h.

	* backend/ebook/e-card-iterator.c,
	backend/ebook/e-card-iterator.h,
	backend/ebook/e-card-list-iterator.c,
	backend/ebook/e-card-list-iterator.h, backend/ebook/e-card-list.c,
	backend/ebook/e-card-list.h: Removed in favor or versions without
	the -card in the e-util directory since these classes are not
	specific to cards at all.

	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h,
	backend/ebook/e-card.c, backend/ebook/e-card.h,
	backend/ebook/load-pine-addressbook.c, backend/ebook/test-card.c,
	backend/pas/pas-backend-file.c: Changed the references to
	e-card-list.c and friends to e-list.c and friends.

	* contact-editor/e-contact-editor.c: Added #include
	<e-contact-save-as.h> to fix a warning.

	* gui/component/Makefile.am: Moved a number of classes associated
	with the select-names object to the new select-names directory.

	* gui/component/addressbook.c: Changed the reference to
	e-select-names.h.

	* gui/component/e-select-names.c, gui/component/e-select-names.h,
	gui/component/select-names.glade,
	gui/component/select-names.glade.h: Moved these files into
	select-names/.

	* gui/component/select-names/.cvsignore,
	gui/component/select-names/Makefile.am,
	gui/component/select-names/e-select-names-manager.c,
	gui/component/select-names/e-select-names-manager.h,
	gui/component/select-names/e-select-names-model.c,
	gui/component/select-names/e-select-names-model.h,
	gui/component/select-names/e-select-names-table-model.c,
	gui/component/select-names/e-select-names-table-model.h,
	gui/component/select-names/e-select-names-text-model.c,
	gui/component/select-names/e-select-names-text-model.h,
	gui/component/select-names/e-select-names.c,
	gui/component/select-names/e-select-names.h,
	gui/component/select-names/recipient.glade,
	gui/component/select-names/select-names.glade,
	gui/component/select-names/select-names.glade.h: New files for
	select names dialog (e-select-names.c, e-select-names.h,
	select-names.glade, select-names.glade.h and recipient.glade moved
	from gui/component/.)

svn path=/trunk/; revision=3876

1 files changed, 12 insertions, 12 deletions

diff --git a/addressbook/backend/pas/pas-backend-file.c b/addressbook/backend/pas/pas-backend-file.c
index f76a92c38c..c9befc7bb1 100644
--- a/addressbook/backend/pas/pas-backend-file.c
+++ b/addressbook/backend/pas/pas-backend-file.c
@@ -159,23 +159,23 @@ static gboolean
 compare_email (ECard *ecard, const char *str,
 	       char *(*compare)(const char*, const char*))
 {
-	ECardList *prop_list;
-	ECardIterator *iter;
+	EList *prop_list;
+	EIterator *iter;
 	gboolean truth = FALSE;
 
 	gtk_object_get(GTK_OBJECT(ecard),
 		       "email", &prop_list, NULL);
 
-	iter = e_card_list_get_iterator(prop_list);
+	iter = e_list_get_iterator(prop_list);
 
-	while (e_card_iterator_is_valid(iter)) {
+	while (e_iterator_is_valid(iter)) {
 		
-		if (compare((char*)e_card_iterator_get(iter), str)) {
+		if (compare((char*)e_iterator_get(iter), str)) {
 			truth = TRUE;
 			break;
 		}
 		else {
-			e_card_iterator_next(iter);
+			e_iterator_next(iter);
 		}
 	}
 
@@ -188,23 +188,23 @@ static gboolean
 compare_phone (ECard *ecard, const char *str,
 	       char *(*compare)(const char*, const char*))
 {
-	ECardList *prop_list;
-	ECardIterator *iter;
+	EList *prop_list;
+	EIterator *iter;
 	gboolean truth = FALSE;
 
 	gtk_object_get(GTK_OBJECT(ecard),
 		       "phone", &prop_list, NULL);
 				
-	iter = e_card_list_get_iterator(prop_list);
+	iter = e_list_get_iterator(prop_list);
 
-	while (e_card_iterator_is_valid(iter)) {
-		ECardPhone *phone = (ECardPhone*)e_card_iterator_get(iter);
+	while (e_iterator_is_valid(iter)) {
+		ECardPhone *phone = (ECardPhone*)e_iterator_get(iter);
 		if (compare(phone->number, str)) {
 			truth = TRUE;
 			break;
 		}
 		else {
-			e_card_iterator_next(iter);
+			e_iterator_next(iter);
 		}
 	}