evolution-data-server r8544 - in trunk/addressbook: . libebook
- From: sragavan svn gnome org
- To: svn-commits-list gnome org
- Subject: evolution-data-server r8544 - in trunk/addressbook: . libebook
- Date: Sun, 2 Mar 2008 12:56:26 +0000 (GMT)
Author: sragavan
Date: Sun Mar 2 12:56:26 2008
New Revision: 8544
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=8544&view=rev
Log:
2008-02-28 Milan Crha <mcrha redhat com>
** Fix for bug #519214
* libebook/e-book.c: (do_remove_contacts), (do_get_book_view):
Book's private mutex should be locked when calling e_book_clear_op
so honor this rule in these function too.
Modified:
trunk/addressbook/ChangeLog
trunk/addressbook/libebook/e-book.c
Modified: trunk/addressbook/libebook/e-book.c
==============================================================================
--- trunk/addressbook/libebook/e-book.c (original)
+++ trunk/addressbook/libebook/e-book.c Sun Mar 2 12:56:26 2008
@@ -1628,7 +1628,9 @@
if (ev._major != CORBA_NO_EXCEPTION) {
+ g_mutex_lock (book->priv->mutex);
e_book_clear_op (book, our_op);
+ g_mutex_unlock (book->priv->mutex);
CORBA_exception_free (&ev);
@@ -1653,7 +1655,9 @@
status = our_op->status;
+ g_mutex_lock (book->priv->mutex);
e_book_clear_op (book, our_op);
+ g_mutex_unlock (book->priv->mutex);
E_BOOK_CHECK_STATUS (status, error);
}
@@ -1880,7 +1884,9 @@
if (ev._major != CORBA_NO_EXCEPTION) {
+ g_mutex_lock (book->priv->mutex);
e_book_clear_op (book, our_op);
+ g_mutex_unlock (book->priv->mutex);
CORBA_exception_free (&ev);
@@ -1907,7 +1913,9 @@
status = our_op->status;
*book_view = our_op->view;
+ g_mutex_lock (book->priv->mutex);
e_book_clear_op (book, our_op);
+ g_mutex_unlock (book->priv->mutex);
E_BOOK_CHECK_STATUS (status, error);
}
@@ -2522,7 +2530,7 @@
EBookStatus status)
{
EBookOp *op;
-
+ d(printf("e_book_response_generic\n"));
g_mutex_lock (book->priv->mutex);
op = e_book_get_op (book, opid);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]