 -}
 Index: evolution-data-server/addressbook/libebook-dbus/e-contact.c
 ===================================================================
---- evolution-data-server.orig/addressbook/libebook-dbus/e-contact.c	2008-07-23 10:03:56.000000000 +0200
-+++ evolution-data-server/addressbook/libebook-dbus/e-contact.c	2008-07-23 10:03:56.000000000 +0200
+--- evolution-data-server.orig/addressbook/libebook-dbus/e-contact.c	2008-07-29 15:17:35.000000000 +0100
++++ evolution-data-server/addressbook/libebook-dbus/e-contact.c	2008-07-29 15:17:36.000000000 +0100
 @@ -405,26 +405,6 @@
  	return contact_type;
  }

+
Index: evolution-data-server/addressbook/libebook-dbus/e-book-view.h
===================================================================
--- evolution-data-server.orig/addressbook/libebook-dbus/e-book-view.h	2008-07-23 10:03:56.000000000 +0200
+++ evolution-data-server/addressbook/libebook-dbus/e-book-view.h	2008-07-23 10:03:56.000000000 +0200
@@ -77,6 +77,9 @@
 void               e_book_view_set_freezable          (EBookView *book_view, gboolean freezable);
 gboolean           e_book_view_is_freezable           (EBookView *book_view);

 
   priv->ids = g_hash_table_new_full (g_str_hash, g_str_equal,
                                      g_free, NULL);
@@ -276,15 +275,20 @@
   G_OBJECT_CLASS (e_data_book_view_parent_class)->dispose (object);
 }
 
+static void reset_array (GPtrArray *array);
+
 static void
 e_data_book_view_finalize (GObject *object)
 {
   EDataBookView *book_view = E_DATA_BOOK_VIEW (object);
   EDataBookViewPrivate *priv = book_view->priv;
 
-  g_strfreev ((char**)g_array_free (priv->adds, FALSE));
-  g_strfreev ((char**)g_array_free (priv->changes, FALSE));
-  g_strfreev ((char**)g_array_free (priv->removes, FALSE));
+  reset_array (priv->adds);
+  reset_array (priv->changes);
+  reset_array (priv->removes);
+  g_ptr_array_free (priv->adds, FALSE);
+  g_ptr_array_free (priv->changes, FALSE);
+  g_ptr_array_free (priv->removes, FALSE);
 
   g_free (priv->card_query);
 
@@ -454,6 +458,17 @@
 }
 
 static void
