Made this pay attention to the return value of e_sexp_parse.

2001-02-21  Christopher James Lahey  <clahey@ximian.com>

	* backend/pas/pas-backend-file.c (pas_backend_file_search): Made
	this pay attention to the return value of e_sexp_parse.

	* gui/component/select-names/e-select-names-text-model.c
	(e_select_names_text_model_activate_obj): Fixed a const
	inconsistency here.

svn path=/trunk/; revision=8321

3 files changed, 22 insertions, 7 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 15d00e02cc..0840b5f178 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,12 @@
+2001-02-21  Christopher James Lahey  <clahey@ximian.com>
+
+	* backend/pas/pas-backend-file.c (pas_backend_file_search): Made
+	this pay attention to the return value of e_sexp_parse.
+
+	* gui/component/select-names/e-select-names-text-model.c
+	(e_select_names_text_model_activate_obj): Fixed a const
+	inconsistency here.
+
 2001-02-21  Chris Toshok  <toshok@ximian.com>
 
 	* backend/pas/pas-book.c (pas_book_queue_get_supported_fields):
diff --git a/addressbook/backend/pas/pas-backend-file.c b/addressbook/backend/pas/pas-backend-file.c
index e46bbd3976..970dbac105 100644
--- a/addressbook/backend/pas/pas-backend-file.c
+++ b/addressbook/backend/pas/pas-backend-file.c
@@ -478,6 +478,7 @@ pas_backend_file_search (PASBackendFile  	      *bf,
 	DB      *db = bf->priv->file_db;
 	DBT     id_dbt, vcard_dbt;
 	int i;
+	int esexp_error;
 	PASBackendFileBookView *view = (PASBackendFileBookView *)cnstview;
 
 	if (!bf->priv->loaded)
@@ -498,7 +499,12 @@ pas_backend_file_search (PASBackendFile  	      *bf,
 	}
 
 	e_sexp_input_text(view->search_sexp, view->search, strlen(view->search));
-	e_sexp_parse(view->search_sexp);
+	esexp_error = e_sexp_parse(view->search_sexp);
+
+	if (esexp_error == -1) {
+		pas_book_view_notify_complete (view->book_view);
+		return;
+	}
 
 	db_error = db->seq(db, &id_dbt, &vcard_dbt, R_FIRST);
 
@@ -521,10 +527,9 @@ pas_backend_file_search (PASBackendFile  	      *bf,
 	if (db_error == -1) {
 		g_warning ("pas_backend_file_search: error building list\n");
 	}
-	else {
-		pas_book_view_notify_add (view->book_view, cards);
-		pas_book_view_notify_complete (view->book_view);
-	}
+
+	pas_book_view_notify_add (view->book_view, cards);
+	pas_book_view_notify_complete (view->book_view);
 
 	/*
 	** It's fine to do this now since the data has been handed off.
diff --git a/addressbook/gui/component/select-names/e-select-names-text-model.c b/addressbook/gui/component/select-names/e-select-names-text-model.c
index 5983ccb93d..13054eb10e 100644
--- a/addressbook/gui/component/select-names/e-select-names-text-model.c
+++ b/addressbook/gui/component/select-names/e-select-names-text-model.c
@@ -296,8 +296,9 @@ e_select_names_text_model_activate_obj (ETextModel *model, gint n)
 
 	data = e_iterator_get (iterator);
 	card = E_CARD (data->card);
-	
-	contact_editor = e_contact_editor_new (card, FALSE);
+
+	/* FIXME: const incorrectness here. */	
+	contact_editor = e_contact_editor_new ((ECard *) card, FALSE);
 	e_contact_editor_raise (contact_editor);
 }