GNOME.org
 

[evolution-data-server/dbus: 32/33] Fix whitespace

commit 7739c3d98388d3aaf96bae371bb3c363cab347e8
Author: Ross Burton <ross linux intel com>
Date:   Mon Jun 1 16:08:00 2009 +0100

    Fix whitespace
---
 addressbook/libedata-book/e-data-book-view.c |  640 +++++++++++++-------------
 1 files changed, 320 insertions(+), 320 deletions(-)

diff --git a/addressbook/libedata-book/e-data-book-view.c b/addressbook/libedata-book/e-data-book-view.c
index ab34722..48a4080 100644
--- a/addressbook/libedata-book/e-data-book-view.c
+++ b/addressbook/libedata-book/e-data-book-view.c
@@ -40,31 +40,31 @@ G_DEFINE_TYPE (EDataBookView, e_data_book_view, G_TYPE_OBJECT);
 #define THRESHOLD 32
 
 struct _EDataBookViewPrivate {
-  EDataBook *book;
-  EBookBackend *backend;
+	EDataBook *book;
+	EBookBackend *backend;
 
-  char* card_query;
-  EBookBackendSExp *card_sexp;
-  int max_results;
+	char* card_query;
+	EBookBackendSExp *card_sexp;
+	int max_results;
 
-  gboolean running;
-  GMutex *pending_mutex;
+	gboolean running;
+	GMutex *pending_mutex;
 
-  GArray *adds;
-  GArray *changes;
-  GArray *removes;
+	GArray *adds;
+	GArray *changes;
+	GArray *removes;
 
-  GHashTable *ids;
-  guint idle_id;
+	GHashTable *ids;
+	guint idle_id;
 };
 
 enum {
-  CONTACTS_ADDED,
-  CONTACTS_CHANGED,
-  CONTACTS_REMOVED,
-  STATUS_MESSAGE,
-  COMPLETE,
-  LAST_SIGNAL
+	CONTACTS_ADDED,
+	CONTACTS_CHANGED,
+	CONTACTS_REMOVED,
+	STATUS_MESSAGE,
+	COMPLETE,
+	LAST_SIGNAL
 };
 
 static guint signals[LAST_SIGNAL] = { 0 };
@@ -74,89 +74,89 @@ static void e_data_book_view_finalize (GObject *object);
 
 static void
 e_data_book_view_class_init (EDataBookViewClass *klass)
-{ 
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->dispose = e_data_book_view_dispose;
-  object_class->finalize = e_data_book_view_finalize;
-
-  signals[CONTACTS_ADDED] =
-    g_signal_new ("contacts-added",
-                  G_OBJECT_CLASS_TYPE (klass),
-                  G_SIGNAL_RUN_LAST,
-                  0, NULL, NULL,
-                  g_cclosure_marshal_VOID__BOXED,
-                  G_TYPE_NONE, 1, G_TYPE_STRV);
-
-  signals[CONTACTS_CHANGED] =
-    g_signal_new ("contacts-changed",
-                  G_OBJECT_CLASS_TYPE (klass),
-                  G_SIGNAL_RUN_LAST,
-                  0, NULL, NULL,
-                  g_cclosure_marshal_VOID__BOXED,
-                  G_TYPE_NONE, 1, G_TYPE_STRV);
-
-  signals[CONTACTS_REMOVED] =
-    g_signal_new ("contacts-removed",
-                  G_OBJECT_CLASS_TYPE (klass),
-                  G_SIGNAL_RUN_LAST,
-                  0, NULL, NULL,
-                  g_cclosure_marshal_VOID__BOXED,
-                  G_TYPE_NONE, 1, G_TYPE_STRV);
-
-  signals[STATUS_MESSAGE] =
-    g_signal_new ("status-message",
-                  G_OBJECT_CLASS_TYPE (klass),
-                  G_SIGNAL_RUN_LAST,
-                  0, NULL, NULL,
-                  g_cclosure_marshal_VOID__STRING,
-                  G_TYPE_NONE, 1, G_TYPE_STRING);
-
-  signals[COMPLETE] =
-    g_signal_new ("complete",
-                  G_OBJECT_CLASS_TYPE (klass),
-                  G_SIGNAL_RUN_LAST,
-                  0, NULL, NULL,
-                  g_cclosure_marshal_VOID__UINT,
-                  G_TYPE_NONE, 1, G_TYPE_UINT);
-
-  g_type_class_add_private (klass, sizeof (EDataBookViewPrivate));
-
-  dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (klass), &dbus_glib_e_data_book_view_object_info);
+{
+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+	object_class->dispose = e_data_book_view_dispose;
+	object_class->finalize = e_data_book_view_finalize;
+
+	signals[CONTACTS_ADDED] =
+		g_signal_new ("contacts-added",
+			      G_OBJECT_CLASS_TYPE (klass),
+			      G_SIGNAL_RUN_LAST,
+			      0, NULL, NULL,
+			      g_cclosure_marshal_VOID__BOXED,
+			      G_TYPE_NONE, 1, G_TYPE_STRV);
+
+	signals[CONTACTS_CHANGED] =
+		g_signal_new ("contacts-changed",
+			      G_OBJECT_CLASS_TYPE (klass),
+			      G_SIGNAL_RUN_LAST,
+			      0, NULL, NULL,
+			      g_cclosure_marshal_VOID__BOXED,
+			      G_TYPE_NONE, 1, G_TYPE_STRV);
+
+	signals[CONTACTS_REMOVED] =
+		g_signal_new ("contacts-removed",
+			      G_OBJECT_CLASS_TYPE (klass),
+			      G_SIGNAL_RUN_LAST,
+			      0, NULL, NULL,
+			      g_cclosure_marshal_VOID__BOXED,
+			      G_TYPE_NONE, 1, G_TYPE_STRV);
+
+	signals[STATUS_MESSAGE] =
+		g_signal_new ("status-message",
+			      G_OBJECT_CLASS_TYPE (klass),
+			      G_SIGNAL_RUN_LAST,
+			      0, NULL, NULL,
+			      g_cclosure_marshal_VOID__STRING,
+			      G_TYPE_NONE, 1, G_TYPE_STRING);
+
+	signals[COMPLETE] =
+		g_signal_new ("complete",
+			      G_OBJECT_CLASS_TYPE (klass),
+			      G_SIGNAL_RUN_LAST,
+			      0, NULL, NULL,
+			      g_cclosure_marshal_VOID__UINT,
+			      G_TYPE_NONE, 1, G_TYPE_UINT);
+
+	g_type_class_add_private (klass, sizeof (EDataBookViewPrivate));
+
+	dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (klass), &dbus_glib_e_data_book_view_object_info);
 }
 
 static void
 e_data_book_view_init (EDataBookView *book_view)
 {
-  EDataBookViewPrivate *priv = E_DATA_BOOK_VIEW_GET_PRIVATE (book_view);
-  book_view->priv = priv;
+	EDataBookViewPrivate *priv = E_DATA_BOOK_VIEW_GET_PRIVATE (book_view);
+	book_view->priv = priv;
 
-  priv->running = FALSE;
-  priv->pending_mutex = g_mutex_new ();
+	priv->running = FALSE;
+	priv->pending_mutex = g_mutex_new ();
 
-  priv->adds = g_array_sized_new (TRUE, TRUE, sizeof (char*), THRESHOLD);
-  priv->changes = g_array_sized_new (TRUE, TRUE, sizeof (char*), THRESHOLD);
-  priv->removes = g_array_sized_new (TRUE, TRUE, sizeof (char*), THRESHOLD);
+	priv->adds = g_array_sized_new (TRUE, TRUE, sizeof (char*), THRESHOLD);
+	priv->changes = g_array_sized_new (TRUE, TRUE, sizeof (char*), THRESHOLD);
+	priv->removes = g_array_sized_new (TRUE, TRUE, sizeof (char*), THRESHOLD);
 
-  priv->ids = g_hash_table_new_full (g_str_hash, g_str_equal,
-                                     g_free, NULL);
+	priv->ids = g_hash_table_new_full (g_str_hash, g_str_equal,
+					   g_free, NULL);
 }
 
 static void
 book_destroyed_cb (gpointer data, GObject *dead)
 {
-  EDataBookView *view = E_DATA_BOOK_VIEW (data);
-  EDataBookViewPrivate *priv = view->priv;
-
-  /* The book has just died, so unset the pointer so we don't try and remove a
-     dead weak reference. */
-  view->priv->book = NULL;
-
-  /* If the view is running stop it here. */
-  if (priv->running) {
-    e_book_backend_stop_book_view (priv->backend, view);
-    priv->running = FALSE;
-  }
+	EDataBookView *view = E_DATA_BOOK_VIEW (data);
+	EDataBookViewPrivate *priv = view->priv;
+
+	/* The book has just died, so unset the pointer so we don't try and remove a
+	   dead weak reference. */
+	view->priv->book = NULL;
+
+	/* If the view is running stop it here. */
+	if (priv->running) {
+		e_book_backend_stop_book_view (priv->backend, view);
+		priv->running = FALSE;
+	}
 }
 
 /**
@@ -173,126 +173,126 @@ book_destroyed_cb (gpointer data, GObject *dead)
 EDataBookView *
 e_data_book_view_new (EDataBook *book, const char *path, const char *card_query, EBookBackendSExp *card_sexp, int max_results)
 {
-  EDataBookView *view;
-  EDataBookViewPrivate *priv;
+	EDataBookView *view;
+	EDataBookViewPrivate *priv;
 
-  view = g_object_new (E_TYPE_DATA_BOOK_VIEW, NULL);
-  priv = view->priv;
+	view = g_object_new (E_TYPE_DATA_BOOK_VIEW, NULL);
+	priv = view->priv;
 
-  priv->book = book;
-  /* Attach a weak reference to the book, so if it dies the book view is destroyed too */
-  g_object_weak_ref (G_OBJECT (priv->book), book_destroyed_cb, view);
-  priv->backend = g_object_ref (e_data_book_get_backend (book));
-  priv->card_query = g_strdup (card_query);
-  priv->card_sexp = card_sexp;
-  priv->max_results = max_results;
+	priv->book = book;
+	/* Attach a weak reference to the book, so if it dies the book view is destroyed too */
+	g_object_weak_ref (G_OBJECT (priv->book), book_destroyed_cb, view);
+	priv->backend = g_object_ref (e_data_book_get_backend (book));
+	priv->card_query = g_strdup (card_query);
+	priv->card_sexp = card_sexp;
+	priv->max_results = max_results;
 
-  dbus_g_connection_register_g_object (connection, path, G_OBJECT (view));
+	dbus_g_connection_register_g_object (connection, path, G_OBJECT (view));
 
-  return view;
+	return view;
 }
 
 static void
 e_data_book_view_dispose (GObject *object)
 {
-  EDataBookView *book_view = E_DATA_BOOK_VIEW (object);
-  EDataBookViewPrivate *priv = book_view->priv;
-
-  if (priv->book) {
-    /* Remove the weak reference */
-    g_object_weak_unref (G_OBJECT (priv->book), book_destroyed_cb, book_view);
-    priv->book = NULL;
-  }
-
-  if (priv->backend) {
-    e_book_backend_remove_book_view (priv->backend, book_view);
-    g_object_unref (priv->backend);
-    priv->backend = NULL;
-  }
-  
-  if (priv->card_sexp) {
-    g_object_unref (priv->card_sexp);
-    priv->card_sexp = NULL;
-  }
-
-  if (priv->idle_id) {
-    g_source_remove (priv->idle_id);
-    priv->idle_id = 0;
-  }
-
-  G_OBJECT_CLASS (e_data_book_view_parent_class)->dispose (object);
+	EDataBookView *book_view = E_DATA_BOOK_VIEW (object);
+	EDataBookViewPrivate *priv = book_view->priv;
+
+	if (priv->book) {
+		/* Remove the weak reference */
+		g_object_weak_unref (G_OBJECT (priv->book), book_destroyed_cb, book_view);
+		priv->book = NULL;
+	}
+
+	if (priv->backend) {
+		e_book_backend_remove_book_view (priv->backend, book_view);
+		g_object_unref (priv->backend);
+		priv->backend = NULL;
+	}
+
+	if (priv->card_sexp) {
+		g_object_unref (priv->card_sexp);
+		priv->card_sexp = NULL;
+	}
+
+	if (priv->idle_id) {
+		g_source_remove (priv->idle_id);
+		priv->idle_id = 0;
+	}
+
+	G_OBJECT_CLASS (e_data_book_view_parent_class)->dispose (object);
 }
 
 static void
 e_data_book_view_finalize (GObject *object)
 {
-  EDataBookView *book_view = E_DATA_BOOK_VIEW (object);
-  EDataBookViewPrivate *priv = book_view->priv;
+	EDataBookView *book_view = E_DATA_BOOK_VIEW (object);
+	EDataBookViewPrivate *priv = book_view->priv;
 
-  reset_array (priv->adds);
-  reset_array (priv->changes);
-  reset_array (priv->removes);
-  g_array_free (priv->adds, TRUE);
-  g_array_free (priv->changes, TRUE);
-  g_array_free (priv->removes, TRUE);
+	reset_array (priv->adds);
+	reset_array (priv->changes);
+	reset_array (priv->removes);
+	g_array_free (priv->adds, TRUE);
+	g_array_free (priv->changes, TRUE);
+	g_array_free (priv->removes, TRUE);
 
-  g_free (priv->card_query);
+	g_free (priv->card_query);
 
-  g_mutex_free (priv->pending_mutex);
+	g_mutex_free (priv->pending_mutex);
 
-  g_hash_table_destroy (priv->ids);
+	g_hash_table_destroy (priv->ids);
 
-  G_OBJECT_CLASS (e_data_book_view_parent_class)->finalize (object);
+	G_OBJECT_CLASS (e_data_book_view_parent_class)->finalize (object);
 }
 
 static gboolean
 bookview_idle_start (gpointer data)
 {
-  EDataBookView *book_view = data;
+	EDataBookView *book_view = data;
 
-  book_view->priv->running = TRUE;
-  book_view->priv->idle_id = 0;
+	book_view->priv->running = TRUE;
+	book_view->priv->idle_id = 0;
 
-  e_book_backend_start_book_view (book_view->priv->backend, book_view);
-  return FALSE;
+	e_book_backend_start_book_view (book_view->priv->backend, book_view);
+	return FALSE;
 }
 
 static gboolean
 impl_BookView_start (EDataBookView *book_view, GError **error)
 {
-  book_view->priv->idle_id = g_idle_add (bookview_idle_start, book_view);
-  return TRUE;
+	book_view->priv->idle_id = g_idle_add (bookview_idle_start, book_view);
+	return TRUE;
 }
 
 static gboolean
 bookview_idle_stop (gpointer data)
 {
-  EDataBookView *book_view = data;
+	EDataBookView *book_view = data;
 
-  e_book_backend_stop_book_view (book_view->priv->backend, book_view);
+	e_book_backend_stop_book_view (book_view->priv->backend, book_view);
 
-  book_view->priv->running = FALSE;
-  book_view->priv->idle_id = 0;
+	book_view->priv->running = FALSE;
+	book_view->priv->idle_id = 0;
 
-  return FALSE;
+	return FALSE;
 }
 
 static gboolean
 impl_BookView_stop (EDataBookView *book_view, GError **error)
 {
-  if (book_view->priv->idle_id)
-    g_source_remove (book_view->priv->idle_id);
-  
-  book_view->priv->idle_id = g_idle_add (bookview_idle_stop, book_view);
-  return TRUE;
+	if (book_view->priv->idle_id)
+		g_source_remove (book_view->priv->idle_id);
+
+	book_view->priv->idle_id = g_idle_add (bookview_idle_stop, book_view);
+	return TRUE;
 }
 
 static gboolean
 impl_BookView_dispose (EDataBookView *book_view, GError **eror)
 {
-  g_object_unref (book_view);
-  
-  return TRUE;
+	g_object_unref (book_view);
+
+	return TRUE;
 }
 
 void
@@ -300,256 +300,256 @@ e_data_book_view_set_thresholds (EDataBookView *book_view,
                                  int minimum_grouping_threshold,
                                  int maximum_grouping_threshold)
 {
-  g_return_if_fail (E_IS_DATA_BOOK_VIEW (book_view));
-  
-  g_debug ("e_data_book_view_set_thresholds does nothing in eds-dbus");
+	g_return_if_fail (E_IS_DATA_BOOK_VIEW (book_view));
+
+	g_debug ("e_data_book_view_set_thresholds does nothing in eds-dbus");
 }
 
 const char*
 e_data_book_view_get_card_query (EDataBookView *book_view)
 {
-  g_return_val_if_fail (E_IS_DATA_BOOK_VIEW (book_view), NULL);
-  return book_view->priv->card_query;
+	g_return_val_if_fail (E_IS_DATA_BOOK_VIEW (book_view), NULL);
+	return book_view->priv->card_query;
 }
 
 EBookBackendSExp*
 e_data_book_view_get_card_sexp (EDataBookView *book_view)
 {
-  g_return_val_if_fail (E_IS_DATA_BOOK_VIEW (book_view), NULL);
-  return book_view->priv->card_sexp;
+	g_return_val_if_fail (E_IS_DATA_BOOK_VIEW (book_view), NULL);
+	return book_view->priv->card_sexp;
 }
 
 int
 e_data_book_view_get_max_results (EDataBookView *book_view)
 {
-  g_return_val_if_fail (E_IS_DATA_BOOK_VIEW (book_view), 0);
-  return book_view->priv->max_results;
+	g_return_val_if_fail (E_IS_DATA_BOOK_VIEW (book_view), 0);
+	return book_view->priv->max_results;
 }
 
 EBookBackend*
 e_data_book_view_get_backend (EDataBookView *book_view)
 {
-  g_return_val_if_fail (E_IS_DATA_BOOK_VIEW (book_view), NULL);
-  return book_view->priv->backend;
+	g_return_val_if_fail (E_IS_DATA_BOOK_VIEW (book_view), NULL);
+	return book_view->priv->backend;
 }
 
 static void
 send_pending_adds (EDataBookView *view)
 {
-  EDataBookViewPrivate *priv = view->priv;
+	EDataBookViewPrivate *priv = view->priv;
 
-  if (priv->adds->len == 0)
-    return;
+	if (priv->adds->len == 0)
+		return;
 
-  g_signal_emit (view, signals[CONTACTS_ADDED], 0, priv->adds->data);
-  reset_array (priv->adds);
+	g_signal_emit (view, signals[CONTACTS_ADDED], 0, priv->adds->data);
+	reset_array (priv->adds);
 }
 
 static void
 send_pending_changes (EDataBookView *view)
 {
-  EDataBookViewPrivate *priv = view->priv;
+	EDataBookViewPrivate *priv = view->priv;
 
-  if (priv->changes->len == 0)
-    return;
+	if (priv->changes->len == 0)
+		return;
 
-  g_signal_emit (view, signals[CONTACTS_CHANGED], 0, priv->changes->data);
-  reset_array (priv->changes);
+	g_signal_emit (view, signals[CONTACTS_CHANGED], 0, priv->changes->data);
+	reset_array (priv->changes);
 }
 
 static void
 send_pending_removes (EDataBookView *view)
 {
-  EDataBookViewPrivate *priv = view->priv;
+	EDataBookViewPrivate *priv = view->priv;
 
-  if (priv->removes->len == 0)
-    return;
+	if (priv->removes->len == 0)
+		return;
 
-  g_signal_emit (view, signals[CONTACTS_REMOVED], 0, priv->removes->data);
-  reset_array (priv->removes);
+	g_signal_emit (view, signals[CONTACTS_REMOVED], 0, priv->removes->data);
+	reset_array (priv->removes);
 }
 
 static void
 notify_change (EDataBookView *view, char *vcard)
 {
-  EDataBookViewPrivate *priv = view->priv;
-  send_pending_adds (view);
-  send_pending_removes (view);
-  
-  g_array_append_val (priv->changes, vcard);
+	EDataBookViewPrivate *priv = view->priv;
+	send_pending_adds (view);
+	send_pending_removes (view);
+
+	g_array_append_val (priv->changes, vcard);
 }
 
 static void
 notify_remove (EDataBookView *view, char *id)
 {
-  EDataBookViewPrivate *priv = view->priv;
+	EDataBookViewPrivate *priv = view->priv;
 
-  send_pending_adds (view);
-  send_pending_changes (view);
+	send_pending_adds (view);
+	send_pending_changes (view);
 
-  g_array_append_val (priv->removes, id);
-  g_hash_table_remove (priv->ids, id);
+	g_array_append_val (priv->removes, id);
+	g_hash_table_remove (priv->ids, id);
 }
 
 static void
 notify_add (EDataBookView *view, const char *id, char *vcard)
 {
-  EDataBookViewPrivate *priv = view->priv;
-  send_pending_changes (view);
-  send_pending_removes (view);
-
-  if (priv->adds->len == THRESHOLD) {
-    send_pending_adds (view);
-  }
-  g_array_append_val (priv->adds, vcard);
-  g_hash_table_insert (priv->ids, g_strdup (id),
-                       GUINT_TO_POINTER (1));
+	EDataBookViewPrivate *priv = view->priv;
+	send_pending_changes (view);
+	send_pending_removes (view);
+
+	if (priv->adds->len == THRESHOLD) {
+		send_pending_adds (view);
+	}
+	g_array_append_val (priv->adds, vcard);
+	g_hash_table_insert (priv->ids, g_strdup (id),
+			     GUINT_TO_POINTER (1));
 }
 
 void
 e_data_book_view_notify_update (EDataBookView *book_view, EContact *contact)
 {
-  EDataBookViewPrivate *priv = book_view->priv;
-  gboolean currently_in_view, want_in_view;
-  const char *id;
-  char *vcard;
-
-  if (!priv->running)
-    return;
-
-  g_mutex_lock (priv->pending_mutex);
-
-  id = e_contact_get_const (contact, E_CONTACT_UID);
-
-  currently_in_view =
-    g_hash_table_lookup (priv->ids, id) != NULL;
-  want_in_view =
-    e_book_backend_sexp_match_contact (priv->card_sexp, contact);
-
-  if (want_in_view) {
-    vcard = e_vcard_to_string (E_VCARD (contact),
-                               EVC_FORMAT_VCARD_30);
-
-    if (currently_in_view)
-      notify_change (book_view, vcard);
-    else
-      notify_add (book_view, id, vcard);
-  } else {
-    if (currently_in_view)
-      notify_remove (book_view, g_strdup (id));
-    /* else nothing; we're removing a card that wasn't there */
-  }
-
-  g_mutex_unlock (priv->pending_mutex);
+	EDataBookViewPrivate *priv = book_view->priv;
+	gboolean currently_in_view, want_in_view;
+	const char *id;
+	char *vcard;
+
+	if (!priv->running)
+		return;
+
+	g_mutex_lock (priv->pending_mutex);
+
+	id = e_contact_get_const (contact, E_CONTACT_UID);
+
+	currently_in_view =
+		g_hash_table_lookup (priv->ids, id) != NULL;
+	want_in_view =
+		e_book_backend_sexp_match_contact (priv->card_sexp, contact);
+
+	if (want_in_view) {
+		vcard = e_vcard_to_string (E_VCARD (contact),
+					   EVC_FORMAT_VCARD_30);
+
+		if (currently_in_view)
+			notify_change (book_view, vcard);
+		else
+			notify_add (book_view, id, vcard);
+	} else {
+		if (currently_in_view)
+			notify_remove (book_view, g_strdup (id));
+		/* else nothing; we're removing a card that wasn't there */
+	}
+
+	g_mutex_unlock (priv->pending_mutex);
 }
 
 void
 e_data_book_view_notify_update_vcard (EDataBookView *book_view, char *vcard)
 {
-  EDataBookViewPrivate *priv = book_view->priv;
-  gboolean currently_in_view, want_in_view;
-  const char *id;
-  EContact *contact;
-
-  if (!priv->running)
-    return;
-
-  g_mutex_lock (priv->pending_mutex);
-
-  contact = e_contact_new_from_vcard (vcard);
-  id = e_contact_get_const (contact, E_CONTACT_UID);
-  currently_in_view =
-    g_hash_table_lookup (priv->ids, id) != NULL;
-  want_in_view =
-    e_book_backend_sexp_match_contact (priv->card_sexp, contact);
-
-  if (want_in_view) {
-    if (currently_in_view)
-      notify_change (book_view, vcard);
-    else
-      notify_add (book_view, id, vcard);
-  } else {
-    if (currently_in_view)
-      notify_remove (book_view, g_strdup (id));
-    else
-      /* else nothing; we're removing a card that wasn't there */
-      g_free (vcard);
-  }
-  /* Do this last so that id is still valid when notify_ is called */
-  g_object_unref (contact);
-
-  g_mutex_unlock (priv->pending_mutex);
+	EDataBookViewPrivate *priv = book_view->priv;
+	gboolean currently_in_view, want_in_view;
+	const char *id;
+	EContact *contact;
+
+	if (!priv->running)
+		return;
+
+	g_mutex_lock (priv->pending_mutex);
+
+	contact = e_contact_new_from_vcard (vcard);
+	id = e_contact_get_const (contact, E_CONTACT_UID);
+	currently_in_view =
+		g_hash_table_lookup (priv->ids, id) != NULL;
+	want_in_view =
+		e_book_backend_sexp_match_contact (priv->card_sexp, contact);
+
+	if (want_in_view) {
+		if (currently_in_view)
+			notify_change (book_view, vcard);
+		else
+			notify_add (book_view, id, vcard);
+	} else {
+		if (currently_in_view)
+			notify_remove (book_view, g_strdup (id));
+		else
+			/* else nothing; we're removing a card that wasn't there */
+			g_free (vcard);
+	}
+	/* Do this last so that id is still valid when notify_ is called */
+	g_object_unref (contact);
+
+	g_mutex_unlock (priv->pending_mutex);
 }
 
 void
 e_data_book_view_notify_update_prefiltered_vcard (EDataBookView *book_view, const char *id, char *vcard)
 {
-  EDataBookViewPrivate *priv = book_view->priv;
-  gboolean currently_in_view;
+	EDataBookViewPrivate *priv = book_view->priv;
+	gboolean currently_in_view;
 
-  if (!priv->running)
-    return;
+	if (!priv->running)
+		return;
 
-  g_mutex_lock (priv->pending_mutex);
+	g_mutex_lock (priv->pending_mutex);
 
-  currently_in_view =
-    g_hash_table_lookup (priv->ids, id) != NULL;
+	currently_in_view =
+		g_hash_table_lookup (priv->ids, id) != NULL;
 
-  if (currently_in_view)
-    notify_change (book_view, vcard);
-  else
-    notify_add (book_view, id, vcard);
+	if (currently_in_view)
+		notify_change (book_view, vcard);
+	else
+		notify_add (book_view, id, vcard);
 
-  g_mutex_unlock (priv->pending_mutex);
+	g_mutex_unlock (priv->pending_mutex);
 }
 
 void
 e_data_book_view_notify_remove (EDataBookView *book_view, const char *id)
 {
-  EDataBookViewPrivate *priv = E_DATA_BOOK_VIEW_GET_PRIVATE (book_view);
+	EDataBookViewPrivate *priv = E_DATA_BOOK_VIEW_GET_PRIVATE (book_view);
+
+	if (!priv->running)
+		return;
 
-  if (!priv->running)
-    return;
+	g_mutex_lock (priv->pending_mutex);
 
-  g_mutex_lock (priv->pending_mutex);
+	if (g_hash_table_lookup (priv->ids, id))
+		notify_remove (book_view, g_strdup (id));
 
-  if (g_hash_table_lookup (priv->ids, id))
-    notify_remove (book_view, g_strdup (id));
-  
-  g_mutex_unlock (priv->pending_mutex);
+	g_mutex_unlock (priv->pending_mutex);
 }
 
 void
 e_data_book_view_notify_complete (EDataBookView *book_view, EDataBookStatus status)
 {
-  EDataBookViewPrivate *priv = book_view->priv;
+	EDataBookViewPrivate *priv = book_view->priv;
+
+	if (!priv->running)
+		return;
 
-  if (!priv->running)
-    return;
+	g_mutex_lock (priv->pending_mutex);
 
-  g_mutex_lock (priv->pending_mutex);
+	send_pending_adds (book_view);
+	send_pending_changes (book_view);
+	send_pending_removes (book_view);
 
-  send_pending_adds (book_view);
-  send_pending_changes (book_view);
-  send_pending_removes (book_view);
+	g_mutex_unlock (priv->pending_mutex);
 
-  g_mutex_unlock (priv->pending_mutex);
-  
-  /* We're done now, so tell the backend to stop?  TODO: this is a bit different to
-     how the CORBA backend works... */
+	/* We're done now, so tell the backend to stop?  TODO: this is a bit different to
+	   how the CORBA backend works... */
 
-  g_signal_emit (book_view, signals[COMPLETE], 0, status);
+	g_signal_emit (book_view, signals[COMPLETE], 0, status);
 }
 
 void
 e_data_book_view_notify_status_message (EDataBookView *book_view, const char *message)
 {
-  EDataBookViewPrivate *priv = E_DATA_BOOK_VIEW_GET_PRIVATE (book_view);
+	EDataBookViewPrivate *priv = E_DATA_BOOK_VIEW_GET_PRIVATE (book_view);
 
-  if (!priv->running)
-    return;
+	if (!priv->running)
+		return;
 
-  g_signal_emit (book_view, signals[STATUS_MESSAGE], 0, message);
+	g_signal_emit (book_view, signals[STATUS_MESSAGE], 0, message);
 }
 
 /**
@@ -562,7 +562,7 @@ e_data_book_view_notify_status_message (EDataBookView *book_view, const char *me
 void
 e_data_book_view_ref (EDataBookView *view)
 {
-  g_object_ref (view);
+	g_object_ref (view);
 }
 
 /**
@@ -575,22 +575,22 @@ e_data_book_view_ref (EDataBookView *view)
 void
 e_data_book_view_unref (EDataBookView *view)
 {
-  g_object_unref (view);
+	g_object_unref (view);
 }
 
 static void
 reset_array (GArray *array)
 {
-  gint i = 0;
-  gchar *tmp = NULL;
-
-  /* Free stored strings */
-  for (i = 0; i < array->len; i++)
-  {
-    tmp = g_array_index (array, gchar *, i);
-    g_free (tmp);
-  }
-
-  /* Force the array size to 0 */
-  g_array_set_size (array, 0);
+	gint i = 0;
+	gchar *tmp = NULL;
+
+	/* Free stored strings */
+	for (i = 0; i < array->len; i++)
+		{
+			tmp = g_array_index (array, gchar *, i);
+			g_free (tmp);
+		}
+
+	/* Force the array size to 0 */
+	g_array_set_size (array, 0);
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]