aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/bbdb
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2006-07-19 15:15:31 +0800
committerRoss Burton <rburton@src.gnome.org>2006-07-19 15:15:31 +0800
commitcbf5c9c9707c2c1538d5afaa4f8060d2bdc09faa (patch)
treeed1804857fdba6eb13e7b3490412b00ccc0605ca /plugins/bbdb
parent4b5ed288c1ff22c8b6eebadf9bd52f28c27dde9f (diff)
downloadgsoc2013-evolution-cbf5c9c9707c2c1538d5afaa4f8060d2bdc09faa.tar.gz
gsoc2013-evolution-cbf5c9c9707c2c1538d5afaa4f8060d2bdc09faa.tar.zst
gsoc2013-evolution-cbf5c9c9707c2c1538d5afaa4f8060d2bdc09faa.zip
[addressbook]
2006-07-18 Ross Burton <ross@openedhand.com> * 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 <poincare@ikezoe.net>, finished by myself. (#347870). [plugins/bbdb] 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) svn path=/trunk/; revision=32343
Diffstat (limited to 'plugins/bbdb')
-rw-r--r--plugins/bbdb/ChangeLog6
-rw-r--r--plugins/bbdb/gaimbuddies.c3
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)