diff options
| author | Chris Toshok <toshok@ximian.com> | 2004-06-11 16:54:23 +0000 |
|---|---|---|
| committer | JP Rosevear <jpr@src.gnome.org> | 2004-06-11 16:54:23 +0000 |
| commit | aa5ac31da0a5c406d2efd9cb4a1b4406804f234e (patch) | |
| tree | cc3570e3618b4ab40fc70f0e7ba2e1c501c2d884 | |
| parent | 33df37121f40f1face9f965b42f297c7a34c6e52 (diff) | |
| download | evolution-data-server-aa5ac31da0a5c406d2efd9cb4a1b4406804f234e.tar.gz | |
[ probable fix for #58803 ]
2004-06-09 Chris Toshok <toshok@ximian.com>
[ probable fix for #58803 ]
* backends/ldap/e-book-backend-ldap.c (ldap_search_handler):
remove the ref/unref of the book view here.
(e_book_backend_ldap_search): move the dup_ref of the book view
here.
(ldap_search_dtor): and the release_unref to here.
2004-06-09 Chris Toshok <toshok@ximian.com>
* backends/ldap/e-book-backend-ldap.c (ldap_search_dtor): we don't
need to lock/unlock the view's mutex anymore.
| -rw-r--r-- | addressbook/ChangeLog | 15 | ||||
| -rw-r--r-- | addressbook/backends/ldap/e-book-backend-ldap.c | 11 |
2 files changed, 18 insertions, 8 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index bcc8a319c..a97a5cd1f 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,18 @@ +2004-06-09 Chris Toshok <toshok@ximian.com> + + [ probable fix for #58803 ] + + * backends/ldap/e-book-backend-ldap.c (ldap_search_handler): + remove the ref/unref of the book view here. + (e_book_backend_ldap_search): move the dup_ref of the book view + here. + (ldap_search_dtor): and the release_unref to here. + +2004-06-09 Chris Toshok <toshok@ximian.com> + + * backends/ldap/e-book-backend-ldap.c (ldap_search_dtor): we don't + need to lock/unlock the view's mutex anymore. + 2004-06-03 Sivaiah Nallagatla <snallagatla@novell.com> * backends/groupwise/e-book-backend-groupwise.c diff --git a/addressbook/backends/ldap/e-book-backend-ldap.c b/addressbook/backends/ldap/e-book-backend-ldap.c index 6f41b78c8..cfee31d5a 100644 --- a/addressbook/backends/ldap/e-book-backend-ldap.c +++ b/addressbook/backends/ldap/e-book-backend-ldap.c @@ -2977,8 +2977,6 @@ ldap_search_handler (LDAPOp *op, LDAPMessage *res) d(printf ("ldap_search_handler (%p)\n", view)); - bonobo_object_dup_ref(bonobo_object_corba_objref(BONOBO_OBJECT(view)), NULL); - if (!search_op->notified_receiving_results) { search_op->notified_receiving_results = TRUE; book_view_notify_status (op->view, _("Receiving LDAP search results...")); @@ -3028,9 +3026,6 @@ ldap_search_handler (LDAPOp *op, LDAPMessage *res) ldap_op_finished (op); } - - - bonobo_object_release_unref(bonobo_object_corba_objref(BONOBO_OBJECT(view)), NULL); } static void @@ -3038,14 +3033,12 @@ ldap_search_dtor (LDAPOp *op) { LDAPSearchOp *search_op = (LDAPSearchOp*) op; - g_mutex_lock (e_data_book_view_get_mutex (search_op->view)); - d(printf ("ldap_search_dtor (%p)\n", search_op->view)); /* unhook us from our EDataBookView */ g_object_set_data (G_OBJECT (search_op->view), "EBookBackendLDAP.BookView::search_op", NULL); - g_mutex_unlock (e_data_book_view_get_mutex (search_op->view)); + bonobo_object_release_unref(bonobo_object_corba_objref(BONOBO_OBJECT(search_op->view)), NULL); g_free (search_op); } @@ -3098,6 +3091,8 @@ e_book_backend_ldap_search (EBookBackendLDAP *bl, op->view = view; + bonobo_object_dup_ref(bonobo_object_corba_objref(BONOBO_OBJECT(view)), NULL); + ldap_op_add ((LDAPOp*)op, E_BOOK_BACKEND(bl), book, view, search_msgid, ldap_search_handler, ldap_search_dtor); |