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/widgets | |
| 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/widgets')
| -rw-r--r-- | addressbook/gui/widgets/eab-contact-display.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c index 082b537e2e..0ce9f346d3 100644 --- a/addressbook/gui/widgets/eab-contact-display.c +++ b/addressbook/gui/widgets/eab-contact-display.c @@ -227,7 +227,7 @@ on_url_requested (GtkHTML *html, const char *url, GtkHTMLStream *handle, if (!photo) photo = e_contact_get (display->priv->contact, E_CONTACT_LOGO); - gtk_html_stream_write (handle, photo->data, photo->length); + gtk_html_stream_write (handle, photo->data.inlined.data, photo->data.inlined.length); gtk_html_end (html, handle, GTK_HTML_STREAM_OK); @@ -575,7 +575,8 @@ eab_contact_display_render_normal (EABContactDisplay *display, EContact *contact photo = e_contact_get (contact, E_CONTACT_PHOTO); if (!photo) photo = e_contact_get (contact, E_CONTACT_LOGO); - if (photo) { + /* Only handle inlined photos for now */ + if (photo && photo->type == E_CONTACT_PHOTO_TYPE_INLINED) { gtk_html_stream_printf (html_stream, "<img border=\"1\" src=\"internal-contact-photo:\">"); e_contact_photo_free (photo); } @@ -645,7 +646,7 @@ eab_contact_display_render_compact (EABContactDisplay *display, EContact *contac image here. we don't scale the pixbuf itself, just insert width/height tags in the html */ - 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); if (pixbuf) |