diff options
| author | Ross Burton <ross@openedhand.com> | 2006-07-19 15:15:31 +0800 |
|---|---|---|
| committer | Ross Burton <rburton@src.gnome.org> | 2006-07-19 15:15:31 +0800 |
| commit | cbf5c9c9707c2c1538d5afaa4f8060d2bdc09faa (patch) | |
| tree | ed1804857fdba6eb13e7b3490412b00ccc0605ca /addressbook/gui/contact-editor/e-contact-editor.c | |
| parent | 4b5ed288c1ff22c8b6eebadf9bd52f28c27dde9f (diff) | |
| download | gsoc2013-evolution-cbf5c9c9707c2c1538d5afaa4f8060d2bdc09faa.tar gsoc2013-evolution-cbf5c9c9707c2c1538d5afaa4f8060d2bdc09faa.tar.gz gsoc2013-evolution-cbf5c9c9707c2c1538d5afaa4f8060d2bdc09faa.tar.bz2 gsoc2013-evolution-cbf5c9c9707c2c1538d5afaa4f8060d2bdc09faa.tar.lz gsoc2013-evolution-cbf5c9c9707c2c1538d5afaa4f8060d2bdc09faa.tar.xz 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 'addressbook/gui/contact-editor/e-contact-editor.c')
| -rw-r--r-- | addressbook/gui/contact-editor/e-contact-editor.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index 0e0e9c0ce1..0a385da616 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -2192,10 +2192,10 @@ fill_in_simple_field (EContactEditor *editor, GtkWidget *widget, gint field_id) } else if (E_IS_IMAGE_CHOOSER (widget)) { EContactPhoto *photo = e_contact_get (contact, field_id); - if (photo) { + if (photo && photo->type == E_CONTACT_PHOTO_TYPE_INLINED) { e_image_chooser_set_image_data (E_IMAGE_CHOOSER (widget), - photo->data, - photo->length); + photo->data.inlined.data, + photo->data.inlined.length); editor->image_set = TRUE; } else { @@ -2259,15 +2259,16 @@ extract_simple_field (EContactEditor *editor, GtkWidget *widget, gint field_id) } else if (E_IS_IMAGE_CHOOSER (widget)) { EContactPhoto photo; + photo.type = E_CONTACT_PHOTO_TYPE_INLINED; if (editor->image_changed) { if (editor->image_set && e_image_chooser_get_image_data (E_IMAGE_CHOOSER (widget), - &photo.data, &photo.length)) { + &photo.data.inlined.data, &photo.data.inlined.length)) { GdkPixbuf *pixbuf, *new; GdkPixbufLoader *loader = gdk_pixbuf_loader_new(); - gdk_pixbuf_loader_write (loader, photo.data, photo.length, NULL); + gdk_pixbuf_loader_write (loader, photo.data.inlined.data, photo.data.inlined.length, NULL); gdk_pixbuf_loader_close (loader, NULL); pixbuf = gdk_pixbuf_loader_get_pixbuf (loader); @@ -2291,8 +2292,8 @@ extract_simple_field (EContactEditor *editor, GtkWidget *widget, gint field_id) new = gdk_pixbuf_scale_simple (pixbuf, width, height, GDK_INTERP_BILINEAR); if (new) { - g_free(photo.data); - gdk_pixbuf_save_to_buffer (new, &photo.data, &photo.length, "jpeg", NULL, "quality", "100", NULL); + g_free(photo.data.inlined.data); + gdk_pixbuf_save_to_buffer (new, &photo.data.inlined.data, &photo.data.inlined.length, "jpeg", NULL, "quality", "100", NULL); g_object_unref (new); } @@ -2305,7 +2306,7 @@ extract_simple_field (EContactEditor *editor, GtkWidget *widget, gint field_id) e_contact_set (contact, field_id, &photo); - g_free (photo.data); + g_free (photo.data.inlined.data); } else { |