diff options
author | Christopher James Lahey <clahey@ximian.com> | 2001-04-15 04:26:40 +0800 |
---|---|---|
committer | Chris Lahey <clahey@src.gnome.org> | 2001-04-15 04:26:40 +0800 |
commit | 1d4c16a76ac2886fc626b7f64ff1f6f284cc9c9f (patch) | |
tree | a7a08eda206fea83a84329ef066e83bdc2f0135a /addressbook/backend/pas/pas-backend-file.c | |
parent | a0a4b49f2d361521bc9173c15148a543a9c4b756 (diff) | |
download | gsoc2013-evolution-1d4c16a76ac2886fc626b7f64ff1f6f284cc9c9f.tar gsoc2013-evolution-1d4c16a76ac2886fc626b7f64ff1f6f284cc9c9f.tar.gz gsoc2013-evolution-1d4c16a76ac2886fc626b7f64ff1f6f284cc9c9f.tar.bz2 gsoc2013-evolution-1d4c16a76ac2886fc626b7f64ff1f6f284cc9c9f.tar.lz gsoc2013-evolution-1d4c16a76ac2886fc626b7f64ff1f6f284cc9c9f.tar.xz gsoc2013-evolution-1d4c16a76ac2886fc626b7f64ff1f6f284cc9c9f.tar.zst gsoc2013-evolution-1d4c16a76ac2886fc626b7f64ff1f6f284cc9c9f.zip |
Added the function e_book_view_listener_stop to tell the book view
2001-04-14 Christopher James Lahey <clahey@ximian.com>
* backend/ebook/e-book-view-listener.c,
backend/ebook/e-book-view-listener.h: Added the function
e_book_view_listener_stop to tell the book view listener to stop
sending signals.
* backend/ebook/e-book-view.c (e_book_view_destroy): Tell the
EBookViewListener to stop when we're destroyed.
* backend/pas/pas-backend-file.c (view_destroy,
pas_backend_file_process_get_book_view,
pas_backend_file_process_get_changes): Cleaned these up a bit
using bonobo_object_ref and bonobo_object_unref.
(pas_backend_file_process_get_book_view,
pas_backend_file_process_get_changes): bonobo_object_release_unref
the EBookListener here.
* backend/pas/pas-backend-ldap.c
(pas_backend_ldap_process_get_book_view): Cleaned this up a bit
using bonobo_object_ref. Make sure to unref the listener when
we're done with it. Put the new book_view in the list before
telling the book_listener that it's ready.
* backend/pas/pas-book-view.c (pas_book_view_construct): Cleaned
this up a bit using bonobo_object_dup_ref.
(pas_book_view_destroy): Cleaned this up a bit using
bonobo_object_release_unref.
* backend/pas/pas-book.c (pas_book_queue_get_book_view,
pas_book_queue_get_changes): bonobo_object_dup_ref here instead of
just duplicating.
svn path=/trunk/; revision=9313
Diffstat (limited to 'addressbook/backend/pas/pas-backend-file.c')
-rw-r--r-- | addressbook/backend/pas/pas-backend-file.c | 63 |
1 files changed, 22 insertions, 41 deletions
diff --git a/addressbook/backend/pas/pas-backend-file.c b/addressbook/backend/pas/pas-backend-file.c index 9e0a24fd50..ec7bdfcd7f 100644 --- a/addressbook/backend/pas/pas-backend-file.c +++ b/addressbook/backend/pas/pas-backend-file.c @@ -187,8 +187,6 @@ cursor_destroy(GtkObject *object, gpointer data) static void view_destroy(GtkObject *object, gpointer data) { - CORBA_Environment ev; - GNOME_Evolution_Addressbook_Book corba_book; PASBook *book = (PASBook *)data; PASBackendFile *bf; EIterator *iterator; @@ -207,18 +205,7 @@ view_destroy(GtkObject *object, gpointer data) g_warning ("Failed to remove from book_views list"); gtk_object_unref(GTK_OBJECT(iterator)); - corba_book = bonobo_object_corba_objref(BONOBO_OBJECT(book)); - - CORBA_exception_init(&ev); - - GNOME_Evolution_Addressbook_Book_unref(corba_book, &ev); - - if (ev._major != CORBA_NO_EXCEPTION) { - g_warning("view_destroy: Exception unreffing " - "corba book.\n"); - } - - CORBA_exception_free(&ev); + bonobo_object_unref(BONOBO_OBJECT(book)); } static void @@ -991,25 +978,13 @@ pas_backend_file_process_get_book_view (PASBackend *backend, PASBackendFile *bf = PAS_BACKEND_FILE (backend); CORBA_Environment ev; PASBookView *book_view; - GNOME_Evolution_Addressbook_Book corba_book; PASBackendFileBookView view; PASBackendFileSearchContext ctx; EIterator *iterator; g_return_if_fail (req->listener != NULL); - corba_book = bonobo_object_corba_objref(BONOBO_OBJECT(book)); - - CORBA_exception_init(&ev); - - GNOME_Evolution_Addressbook_Book_ref(corba_book, &ev); - - if (ev._major != CORBA_NO_EXCEPTION) { - g_warning("pas_backend_file_process_get_book_view: Exception reffing " - "corba book.\n"); - } - - CORBA_exception_free(&ev); + bonobo_object_ref(BONOBO_OBJECT(book)); book_view = pas_book_view_new (req->listener); @@ -1033,11 +1008,20 @@ pas_backend_file_process_get_book_view (PASBackend *backend, iterator = e_list_get_iterator(bf->priv->book_views); e_iterator_last(iterator); - pas_backend_file_search (bf, book, e_iterator_get(iterator)); gtk_object_unref(GTK_OBJECT(iterator)); g_free(req->search); + CORBA_exception_init(&ev); + + bonobo_object_release_unref (req->listener, &ev); + + if (ev._major != CORBA_NO_EXCEPTION) { + g_warning("pas_backend_file_process_get_book_view: Exception unreffing " + "listener.\n"); + } + + CORBA_exception_free(&ev); } static void @@ -1048,25 +1032,13 @@ pas_backend_file_process_get_changes (PASBackend *backend, PASBackendFile *bf = PAS_BACKEND_FILE (backend); CORBA_Environment ev; PASBookView *book_view; - GNOME_Evolution_Addressbook_Book corba_book; PASBackendFileBookView view; PASBackendFileChangeContext ctx; EIterator *iterator; g_return_if_fail (req->listener != NULL); - corba_book = bonobo_object_corba_objref(BONOBO_OBJECT(book)); - - CORBA_exception_init(&ev); - - GNOME_Evolution_Addressbook_Book_ref(corba_book, &ev); - - if (ev._major != CORBA_NO_EXCEPTION) { - g_warning("pas_backend_file_process_get_book_view: Exception reffing " - "corba book.\n"); - } - - CORBA_exception_free(&ev); + bonobo_object_ref(BONOBO_OBJECT(book)); book_view = pas_book_view_new (req->listener); @@ -1100,6 +1072,15 @@ pas_backend_file_process_get_changes (PASBackend *backend, gtk_object_unref(GTK_OBJECT(iterator)); g_free(req->search); + CORBA_exception_init(&ev); + bonobo_object_release_unref (req->listener, &ev); + + if (ev._major != CORBA_NO_EXCEPTION) { + g_warning("pas_backend_file_process_get_changed: Exception unreffing " + "listener.\n"); + } + + CORBA_exception_free(&ev); } static void |