[evolution/wip/gsettings] Bug #645610 - [regression] Editing contact doesn't refresh view

[Rodrigo Moya <rodrigo src gnome org>]

commit 57ba9240f72e2d24bf4e72e52db6fd768761a819
Author: Milan Crha <mcrha redhat com>
Date:   Tue Apr 19 09:39:57 2011 +0200

    Bug #645610 - [regression] Editing contact doesn't refresh view

 addressbook/gui/widgets/e-addressbook-model.c |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c
index 6f679a4..8e62e40 100644
--- a/addressbook/gui/widgets/e-addressbook-model.c
+++ b/addressbook/gui/widgets/e-addressbook-model.c
@@ -255,28 +255,27 @@ modify_contact (EBookView *book_view,
 	array = model->priv->contacts;
 
 	while (contact_list != NULL) {
-		EContact *contact = contact_list->data;
+		EContact *new_contact = contact_list->data;
 		const gchar *target_uid;
 		gint ii;
 
-		target_uid = e_contact_get_const (contact, E_CONTACT_UID);
+		target_uid = e_contact_get_const (new_contact, E_CONTACT_UID);
 
 		for (ii = 0; ii < array->len; ii++) {
-			EContact *contact;
+			EContact *old_contact;
 			const gchar *uid;
 
-			contact = array->pdata[ii];
-			g_return_if_fail (contact != NULL);
+			old_contact = array->pdata[ii];
+			g_return_if_fail (old_contact != NULL);
 
-			uid = e_contact_get_const (contact, E_CONTACT_UID);
+			uid = e_contact_get_const (old_contact, E_CONTACT_UID);
 			g_return_if_fail (uid != NULL);
 
 			if (strcmp (uid, target_uid) != 0)
 				continue;
 
-			g_object_unref (contact);
-			contact = e_contact_duplicate (contact);
-			array->pdata[ii] = contact;
+			g_object_unref (old_contact);
+			array->pdata[ii] = e_contact_duplicate (new_contact);
 
 			g_signal_emit (
 				model, signals[CONTACT_CHANGED], 0, ii);