aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog16
-rw-r--r--addressbook/backend/pas/pas-backend-file.c5
-rw-r--r--addressbook/backend/pas/pas-backend-ldap.c18
3 files changed, 31 insertions, 8 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 8c4d44aa26..f9958c8aea 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,21 @@
2001-05-23 Chris Toshok <toshok@ximian.com>
+ * backend/pas/pas-backend-ldap.c (view_destroy): fix strings such
+ that ones that happening at the beginning or during an operation
+ are followed by "..." and those that stop the operation are
+ followed by "."
+ (create_card_handler): same.
+ (ldap_op_process_current): same, and also call _notify_complete if
+ we can't connect to ldap server.
+ (poll_ldap): same, and change "Polling for LDAP search result" to
+ "Receiving LDAP search results"
+
+ * backend/pas/pas-backend-file.c (pas_backend_file_search): call
+ notify_status_message at the beginning of this function, and
+ whenever we call _notify_complete.
+
+2001-05-23 Chris Toshok <toshok@ximian.com>
+
* gui/widgets/e-addressbook-model.h: add sequence_complete_id to
EAddressbookModel and stop_state_changed to
EAddressbookModelClass. also, add prototype for
diff --git a/addressbook/backend/pas/pas-backend-file.c b/addressbook/backend/pas/pas-backend-file.c
index c4d1e0792f..d5bf2c6410 100644
--- a/addressbook/backend/pas/pas-backend-file.c
+++ b/addressbook/backend/pas/pas-backend-file.c
@@ -486,6 +486,8 @@ pas_backend_file_search (PASBackendFile *bf,
if (!bf->priv->loaded)
return;
+ pas_book_view_notify_status_message (view->book_view, "Searching...");
+
if (view->search_sexp)
e_sexp_unref(view->search_sexp);
view->search_sexp = e_sexp_new();
@@ -506,7 +508,9 @@ pas_backend_file_search (PASBackendFile *bf,
file_version_name_len = strlen (PAS_BACKEND_FILE_VERSION_NAME);
if (esexp_error == -1) {
+ /* need a different error message here. */
pas_book_view_notify_complete (view->book_view);
+ pas_book_view_notify_status_message (view->book_view, "Error in search expression.");
return;
}
@@ -553,6 +557,7 @@ pas_backend_file_search (PASBackendFile *bf,
pas_book_view_notify_add (view->book_view, cards);
pas_book_view_notify_complete (view->book_view);
+ pas_book_view_notify_status_message (view->book_view, "Search complete");
/*
** It's fine to do this now since the data has been handed off.
diff --git a/addressbook/backend/pas/pas-backend-ldap.c b/addressbook/backend/pas/pas-backend-ldap.c
index cab9f96f54..fcb46bcae8 100644
--- a/addressbook/backend/pas/pas-backend-ldap.c
+++ b/addressbook/backend/pas/pas-backend-ldap.c
@@ -249,7 +249,7 @@ view_destroy(GtkObject *object, gpointer data)
ldap connection. remove the idle
handler and anbandon the msg id */
g_source_remove(view->search_idle);
- pas_book_view_notify_status_message (view->book_view, "Abandoning pending search");
+ pas_book_view_notify_status_message (view->book_view, "Abandoning pending search.");
if (view->search_msgid != -1)
ldap_abandon (bl->priv->ldap, view->search_msgid);
@@ -439,7 +439,7 @@ ldap_op_process_current (PASBackend *backend)
if (!bl->priv->connected) {
if (op->view)
- pas_book_view_notify_status_message (op->view, "Connecting to LDAP server");
+ pas_book_view_notify_status_message (op->view, "Connecting to LDAP server...");
pas_backend_ldap_connect(bl);
}
@@ -448,8 +448,10 @@ ldap_op_process_current (PASBackend *backend)
ldap_op_finished (op);
}
else {
- if (op->view)
- pas_book_view_notify_status_message (op->view, "Unable to connect to LDAP server");
+ if (op->view) {
+ pas_book_view_notify_complete (op->view);
+ pas_book_view_notify_status_message (op->view, "Unable to connect to LDAP server.");
+ }
ldap_op_finished (op);
}
@@ -829,7 +831,7 @@ create_card_handler (PASBackend *backend, LDAPOp *op)
ldap_mods = (LDAPMod**)mod_array->pdata;
if (op->view)
- pas_book_view_notify_status_message (op->view, "Adding card to LDAP server");
+ pas_book_view_notify_status_message (op->view, "Adding card to LDAP server...");
/* actually perform the ldap add */
ldap_error = ldap_add_s (ldap, dn, ldap_mods);
@@ -1839,12 +1841,12 @@ poll_ldap (LDAPSearchOp *op)
GList *cards = NULL;
static int received = 0;
- pas_book_view_notify_status_message (view->book_view, "Polling for LDAP search result");
+ pas_book_view_notify_status_message (view->book_view, "Receiving LDAP search results...");
rc = ldap_result (ldap, view->search_msgid, 0, NULL, &res);
if (rc == -1 && received == 0) {
- pas_book_view_notify_status_message (view->book_view, "Restarting search");
+ pas_book_view_notify_status_message (view->book_view, "Restarting search.");
/* connection went down and we never got any. */
bl->priv->connected = FALSE;
@@ -1858,7 +1860,7 @@ poll_ldap (LDAPSearchOp *op)
pas_book_view_notify_complete (view->book_view);
ldap_op_finished ((LDAPOp*)op);
received = 0;
- pas_book_view_notify_status_message (view->book_view, "Search complete");
+ pas_book_view_notify_status_message (view->book_view, "Search complete.");
return FALSE;
}