aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/backend/pas
diff options
context:
space:
mode:
authorChristopher James Lahey <clahey@helixcode.com>2000-05-30 21:41:12 +0800
committerChris Lahey <clahey@src.gnome.org>2000-05-30 21:41:12 +0800
commit886713b8b1393dca9f9c9abe87ccb928eca8c0ef (patch)
tree5840a802acf3f9b04c20060f8697ab31bb9bc479 /addressbook/backend/pas
parent0ae2ea2e320b1f1e1aaa640316908378e0a064dc (diff)
downloadgsoc2013-evolution-886713b8b1393dca9f9c9abe87ccb928eca8c0ef.tar.gz
gsoc2013-evolution-886713b8b1393dca9f9c9abe87ccb928eca8c0ef.tar.zst
gsoc2013-evolution-886713b8b1393dca9f9c9abe87ccb928eca8c0ef.zip
Added "sequence_complete" signal.
2000-05-30 Christopher James Lahey <clahey@helixcode.com> * backend/ebook/e-book-view-listener.c, backend/ebook/e-book-view-listener.h, backend/ebook/e-book-view.c, backend/ebook/e-book-view.h, backend/idl/addressbook.idl, backend/pas/pas-backend-file.c, backend/pas/pas-backend-ldap.c, backend/pas/pas-book-factory.c, backend/pas/pas-book-view.c, backend/pas/pas-book-view.h: Added "sequence_complete" signal. * printing/e-contact-print.c: Made printing wait for "sequence_complete" signal and made it sort. svn path=/trunk/; revision=3279
Diffstat (limited to 'addressbook/backend/pas')
-rw-r--r--addressbook/backend/pas/pas-backend-file.c10
-rw-r--r--addressbook/backend/pas/pas-backend-ldap.c1
-rw-r--r--addressbook/backend/pas/pas-book-factory.c2
-rw-r--r--addressbook/backend/pas/pas-book-view.c17
-rw-r--r--addressbook/backend/pas/pas-book-view.h1
5 files changed, 28 insertions, 3 deletions
diff --git a/addressbook/backend/pas/pas-backend-file.c b/addressbook/backend/pas/pas-backend-file.c
index 56a0fd4652..f76a92c38c 100644
--- a/addressbook/backend/pas/pas-backend-file.c
+++ b/addressbook/backend/pas/pas-backend-file.c
@@ -458,6 +458,7 @@ pas_backend_file_search (PASBackendFile *bf,
}
else {
pas_book_view_notify_add (view->book_view, cards);
+ pas_book_view_notify_complete (view->book_view);
}
/*
@@ -529,8 +530,10 @@ pas_backend_file_process_create_card (PASBackend *backend,
if (id) {
for (list = bf->priv->book_views; list; list = g_list_next(list)) {
PASBackendFileBookView *view = list->data;
- if (vcard_matches_search (view, vcard))
+ if (vcard_matches_search (view, vcard)) {
pas_book_view_notify_add_1 (view->book_view, vcard);
+ pas_book_view_notify_complete (view->book_view);
+ }
}
pas_book_respond_create (
@@ -592,8 +595,10 @@ pas_backend_file_process_remove_card (PASBackend *backend,
vcard_string = vcard_dbt.data;
for (list = bf->priv->book_views; list; list = g_list_next(list)) {
PASBackendFileBookView *view = list->data;
- if (vcard_matches_search (view, vcard_string))
+ if (vcard_matches_search (view, vcard_string)) {
pas_book_view_notify_remove (view->book_view, req->id);
+ pas_book_view_notify_complete (view->book_view);
+ }
}
pas_book_respond_remove (
@@ -655,6 +660,7 @@ pas_backend_file_process_modify_card (PASBackend *backend,
pas_book_view_notify_add_1 (view->book_view, req->vcard);
else /* if (old_match) */
pas_book_view_notify_remove (view->book_view, id);
+ pas_book_view_notify_complete (view->book_view);
}
pas_book_respond_modify (
diff --git a/addressbook/backend/pas/pas-backend-ldap.c b/addressbook/backend/pas/pas-backend-ldap.c
index 2298693f94..02719657c3 100644
--- a/addressbook/backend/pas/pas-backend-ldap.c
+++ b/addressbook/backend/pas/pas-backend-ldap.c
@@ -623,6 +623,7 @@ poll_ldap (PASBackendLDAPBookView *view)
if ((rc = ldap_result (ldap, view->search_msgid, 0, NULL, &res))
!= LDAP_RES_SEARCH_ENTRY) {
view->search_idle = 0;
+ pas_book_view_notify_complete (view->book_view);
return FALSE;
}
diff --git a/addressbook/backend/pas/pas-book-factory.c b/addressbook/backend/pas/pas-book-factory.c
index f4012b2adf..626c7420e2 100644
--- a/addressbook/backend/pas/pas-book-factory.c
+++ b/addressbook/backend/pas/pas-book-factory.c
@@ -359,7 +359,7 @@ impl_Evolution_BookFactory_open_book (PortableServer_Servant servant,
listener,
Evolution_BookListener_ProtocolNotSupported,
CORBA_OBJECT_NIL,
- &ev);
+ ev);
return;
}
diff --git a/addressbook/backend/pas/pas-book-view.c b/addressbook/backend/pas/pas-book-view.c
index d218112555..4e1c8697aa 100644
--- a/addressbook/backend/pas/pas-book-view.c
+++ b/addressbook/backend/pas/pas-book-view.c
@@ -125,6 +125,23 @@ pas_book_view_notify_add_1 (PASBookView *book_view,
g_list_free(list);
}
+void
+pas_book_view_notify_complete (PASBookView *book_view)
+{
+ CORBA_Environment ev;
+
+ CORBA_exception_init (&ev);
+
+ Evolution_BookViewListener_signal_sequence_complete (
+ book_view->priv->listener, &ev);
+
+ if (ev._major != CORBA_NO_EXCEPTION) {
+ g_warning ("pas_book_view_notify_complete: Exception signaling BookViewListener!\n");
+ }
+
+ CORBA_exception_free (&ev);
+}
+
static gboolean
pas_book_view_construct (PASBookView *book_view,
Evolution_BookViewListener listener)
diff --git a/addressbook/backend/pas/pas-book-view.h b/addressbook/backend/pas/pas-book-view.h
index 55023b48ed..b9cdbee876 100644
--- a/addressbook/backend/pas/pas-book-view.h
+++ b/addressbook/backend/pas/pas-book-view.h
@@ -41,6 +41,7 @@ void pas_book_view_notify_add (PASBookView
const GList *cards);
void pas_book_view_notify_add_1 (PASBookView *book_view,
const char *card);
+void pas_book_view_notify_complete (PASBookView *book_view);
GtkType pas_book_view_get_type (void);