diff options
author | Christopher James Lahey <clahey@ximian.com> | 2001-04-15 01:19:45 +0800 |
---|---|---|
committer | Chris Lahey <clahey@src.gnome.org> | 2001-04-15 01:19:45 +0800 |
commit | a0a4b49f2d361521bc9173c15148a543a9c4b756 (patch) | |
tree | ff0c4ad2342b65b424737859917e117a12cc40a8 /addressbook/backend/ebook/e-book.c | |
parent | 04fac44de1b9b0106ef95b6bf6cfc2d877b01fd2 (diff) | |
download | gsoc2013-evolution-a0a4b49f2d361521bc9173c15148a543a9c4b756.tar gsoc2013-evolution-a0a4b49f2d361521bc9173c15148a543a9c4b756.tar.gz gsoc2013-evolution-a0a4b49f2d361521bc9173c15148a543a9c4b756.tar.bz2 gsoc2013-evolution-a0a4b49f2d361521bc9173c15148a543a9c4b756.tar.lz gsoc2013-evolution-a0a4b49f2d361521bc9173c15148a543a9c4b756.tar.xz gsoc2013-evolution-a0a4b49f2d361521bc9173c15148a543a9c4b756.tar.zst gsoc2013-evolution-a0a4b49f2d361521bc9173c15148a543a9c4b756.zip |
Ref the cursor here when we receive it.
2001-04-14 Christopher James Lahey <clahey@ximian.com>
* backend/ebook/e-book-listener.c
(impl_BookListener_respond_get_cursor): Ref the cursor here when
we receive it.
(impl_BookListener_respond_get_view,
impl_BookListener_respond_get_changes): Ref the book_view here
when we receive it.
(impl_BookListener_respond_open_book): Ref the book here when we
receive it.
(e_book_listener_destroy): Unref the objects in our queue here.
* backend/ebook/e-book-view.c (e_book_view_construct): Cleaned
this up using bonobo_object_dup_ref.
(e_book_view_destroy): Cleaned this up using
bonobo_object_release_unref.
* backend/ebook/e-book.c (e_book_do_response_get_cursor,
e_book_do_response_get_view, e_book_do_response_get_changes,
e_book_unload_uri): Cleaned this up using
bonobo_object_release_unref.
svn path=/trunk/; revision=9311
Diffstat (limited to 'addressbook/backend/ebook/e-book.c')
-rw-r--r-- | addressbook/backend/ebook/e-book.c | 46 |
1 files changed, 5 insertions, 41 deletions
diff --git a/addressbook/backend/ebook/e-book.c b/addressbook/backend/ebook/e-book.c index aaa46af719..a5231f8303 100644 --- a/addressbook/backend/ebook/e-book.c +++ b/addressbook/backend/ebook/e-book.c @@ -195,16 +195,7 @@ e_book_do_response_get_cursor (EBook *book, */ CORBA_exception_init (&ev); - Bonobo_Unknown_unref (resp->cursor, &ev); - - if (ev._major != CORBA_NO_EXCEPTION) { - g_warning ("e_book_do_response_get_cursor: Exception unref'ing " - "remote GNOME_Evolution_Addressbook_CardCursor interface!\n"); - CORBA_exception_free (&ev); - CORBA_exception_init (&ev); - } - - CORBA_Object_release (resp->cursor, &ev); + bonobo_object_release_unref (resp->cursor, &ev); if (ev._major != CORBA_NO_EXCEPTION) { g_warning ("e_book_do_response_get_cursor: Exception releasing " @@ -237,7 +228,7 @@ e_book_do_response_get_view (EBook *book, } book_view = e_book_view_new(resp->book_view, op->listener); - + /* Only execute the callback if the operation is still flagged as active (i.e. hasn't been cancelled. This is mildly wasteful since we unnecessaryily create the book_view, etc... but I'm leery of tinkering with the CORBA magic. */ @@ -253,16 +244,7 @@ e_book_do_response_get_view (EBook *book, */ CORBA_exception_init (&ev); - Bonobo_Unknown_unref (resp->book_view, &ev); - - if (ev._major != CORBA_NO_EXCEPTION) { - g_warning ("e_book_do_response_get_view: Exception unref'ing " - "remote GNOME_Evolution_Addressbook_BookView interface!\n"); - CORBA_exception_free (&ev); - CORBA_exception_init (&ev); - } - - CORBA_Object_release (resp->book_view, &ev); + bonobo_object_release_unref (resp->book_view, &ev); if (ev._major != CORBA_NO_EXCEPTION) { g_warning ("e_book_do_response_get_view: Exception releasing " @@ -307,16 +289,7 @@ e_book_do_response_get_changes (EBook *book, */ CORBA_exception_init (&ev); - Bonobo_Unknown_unref (resp->book_view, &ev); - - if (ev._major != CORBA_NO_EXCEPTION) { - g_warning ("e_book_do_response_get_changes: Exception unref'ing " - "remote GNOME_Evolution_Addressbook_BookView interface!\n"); - CORBA_exception_free (&ev); - CORBA_exception_init (&ev); - } - - CORBA_Object_release (resp->book_view, &ev); + bonobo_object_release_unref (resp->book_view, &ev); if (ev._major != CORBA_NO_EXCEPTION) { g_warning ("e_book_do_response_get_changes: Exception releasing " @@ -546,16 +519,7 @@ e_book_unload_uri (EBook *book) */ CORBA_exception_init (&ev); - Bonobo_Unknown_unref (book->priv->corba_book, &ev); - - if (ev._major != CORBA_NO_EXCEPTION) { - g_warning ("e_book_unload_uri: Exception unref'ing " - "remote GNOME_Evolution_Addressbook_Book interface!\n"); - CORBA_exception_free (&ev); - CORBA_exception_init (&ev); - } - - CORBA_Object_release (book->priv->corba_book, &ev); + bonobo_object_release_unref (book->priv->corba_book, &ev); if (ev._major != CORBA_NO_EXCEPTION) { g_warning ("e_book_unload_uri: Exception releasing " |