diff options
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/bbdb/ChangeLog | 6 | ||||
| -rw-r--r-- | plugins/bbdb/gaimbuddies.c | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/plugins/bbdb/ChangeLog b/plugins/bbdb/ChangeLog index c4df7281a4..92a5b377e7 100644 --- a/plugins/bbdb/ChangeLog +++ b/plugins/bbdb/ChangeLog @@ -1,3 +1,9 @@ +2006-07-18 Ross Burton <ross@openedhand.com> + + * gaimbuddies.c: + Fix for EContactPhoto change. Partially fixed by Hiroyuki Ikezoe + <poincare@ikezoe.net>, rest by me. (#347870) + 2006-07-12 Andre Klapper <a9016009@gmx.de> * bbdb.c: Marking two strings for translation that were accidentally diff --git a/plugins/bbdb/gaimbuddies.c b/plugins/bbdb/gaimbuddies.c index d4d104bbf1..76ef1a0f2c 100644 --- a/plugins/bbdb/gaimbuddies.c +++ b/plugins/bbdb/gaimbuddies.c @@ -245,8 +245,9 @@ bbdb_merge_buddy_to_contact (EBook *book, GaimBuddy *b, EContact *c) if (photo == NULL) { photo = g_new0 (EContactPhoto, 1); + photo->type = E_CONTACT_PHOTO_TYPE_INLINED; - if (! g_file_get_contents (b->icon, &photo->data, &photo->length, &error)) { + if (! g_file_get_contents (b->icon, &photo->data.inlined.data, &photo->data.inlined.length, &error)) { g_warning ("bbdb: Could not read buddy icon: %s\n", error->message); g_error_free (error); for (l = ims; l != NULL; l = l->next) |