From cbf5c9c9707c2c1538d5afaa4f8060d2bdc09faa Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 19 Jul 2006 07:15:31 +0000 Subject: [addressbook] 2006-07-18 Ross Burton * addressbook/gui/contact-editor/e-contact-editor.c: * addressbook/gui/contact-list-editor/e-contact-list-editor.c: * addressbook/gui/widgets/eab-contact-display.c: Fix for EContactPhoto changes. Partially fixed by Hiroyuki Ikezoe , finished by myself. (#347870). [plugins/bbdb] 2006-07-18 Ross Burton * gaimbuddies.c: Fix for EContactPhoto change. Partially fixed by Hiroyuki Ikezoe , rest by me. (#347870) svn path=/trunk/; revision=32343 --- addressbook/gui/contact-list-editor/e-contact-list-editor.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'addressbook/gui/contact-list-editor') diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c index 5674ffb7db..9b0f6043bb 100644 --- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c +++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c @@ -1088,8 +1088,10 @@ extract_info(EContactListEditor *editor) &image_data_len)) { EContactPhoto photo; - photo.data = image_data; - photo.length = image_data_len; + photo.type = E_CONTACT_PHOTO_TYPE_INLINED; + photo.data.inlined.mime_type = NULL; + photo.data.inlined.data = image_data; + photo.data.inlined.length = image_data_len; e_contact_set (contact, E_CONTACT_LOGO, &photo); g_free (image_data); @@ -1177,8 +1179,8 @@ fill_in_info(EContactListEditor *editor) g_list_free (email_list); photo = e_contact_get (editor->contact, E_CONTACT_LOGO); - if (photo) { - e_image_chooser_set_image_data (E_IMAGE_CHOOSER (editor->list_image), photo->data, photo->length); + if (photo && photo->type == E_CONTACT_PHOTO_TYPE_INLINED) { + e_image_chooser_set_image_data (E_IMAGE_CHOOSER (editor->list_image), photo->data.inlined.data, photo->data.inlined.length); e_contact_photo_free (photo); } } -- cgit v1.2.3