[evolution-data-server] Bug 659165 â editing eds contacts that has an avatar fails

[Philip Withnall <pwithnall src gnome org>]

commit 964f7a5fcdc0b93cfe72285e6dbb9d9fd7141d2c
Author: Philip Withnall <philip tecnocode co uk>
Date:   Sat Sep 17 10:18:07 2011 +0100

    Bug 659165 â editing eds contacts that has an avatar fails
    
    Fix the propagation of avatar data for contacts across contact modifications
    which don't edit the avatar data.
    
    Closes: bgo#659165

 .../backends/google/e-book-backend-google.c        |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/addressbook/backends/google/e-book-backend-google.c b/addressbook/backends/google/e-book-backend-google.c
index 9ff375f..977ef7f 100644
--- a/addressbook/backends/google/e-book-backend-google.c
+++ b/addressbook/backends/google/e-book-backend-google.c
@@ -1683,7 +1683,10 @@ modify_contact_cb (GDataService *service,
 	 * we can update the EContact with the photo data and ETag. */
 	switch (data->photo_operation) {
 		case LEAVE_PHOTO:
-			/* Do nothing. */
+			/* Do nothing apart from copy the photo stolen from the old GDataContactsContact to the updated one we've just received from
+			 * Google. */
+			g_object_set_data_full (G_OBJECT (new_contact), "photo", data->photo, (GDestroyNotify) e_contact_photo_free);
+			data->photo = NULL;
 			break;
 		case ADD_PHOTO:
 		case UPDATE_PHOTO: