evolution-data-server r10087 - in trunk/addressbook: . libebook

[tobiasmue svn gnome org]

Author: tobiasmue
Date: Mon Feb 23 21:08:15 2009
New Revision: 10087
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=10087&view=rev

Log:
2009-02-23  Tobias Mueller  <tobiasmue svn gnome org>

    * libebook/e-book.c: Hand book to kill_remaining_ops rather than
    a pointer. Patch by Tom Parker.
    Fixes bug 566984. 



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	Mon Feb 23 21:08:15 2009
@@ -3963,12 +3963,13 @@
 kill_remaining_ops (gpointer key, gpointer value, gpointer user_data)
 {
 	EBookOp *op = value;
+	EBook *book = user_data;
 
 	if (!op)
 		return;
 
 	find_key_value (key, value, NULL);
-	e_book_clear_op (op->book, op);
+	e_book_clear_op (book, op);
 }
 
 static void
@@ -4026,7 +4027,7 @@
 			g_object_unref (book->priv->source);
 
 		g_mutex_lock (book->priv->mutex);
-		g_hash_table_foreach (book->priv->id_to_op, kill_remaining_ops, NULL);
+		g_hash_table_foreach (book->priv->id_to_op, kill_remaining_ops, book);
 		g_hash_table_destroy (book->priv->id_to_op);
 		g_mutex_unlock (book->priv->mutex);