diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2007-10-10 12:54:36 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2007-10-10 12:54:36 +0800 |
| commit | b32649a94cd485f742d2ad5f1b76d7385393e137 (patch) | |
| tree | 002248795c141c992667d73fbf34c40f394fbbf0 /addressbook/gui/contact-editor | |
| parent | 6a2861c3aa49e9439d3e665b0855222716add3a3 (diff) | |
| download | gsoc2013-evolution-b32649a94cd485f742d2ad5f1b76d7385393e137.tar gsoc2013-evolution-b32649a94cd485f742d2ad5f1b76d7385393e137.tar.gz gsoc2013-evolution-b32649a94cd485f742d2ad5f1b76d7385393e137.tar.bz2 gsoc2013-evolution-b32649a94cd485f742d2ad5f1b76d7385393e137.tar.lz gsoc2013-evolution-b32649a94cd485f742d2ad5f1b76d7385393e137.tar.xz gsoc2013-evolution-b32649a94cd485f742d2ad5f1b76d7385393e137.tar.zst gsoc2013-evolution-b32649a94cd485f742d2ad5f1b76d7385393e137.zip | |
** Fixes bug #437579
2007-10-09 Matthew Barnes <mbarnes@redhat.com>
** Fixes bug #437579
* addressbook/conduit/address-conduit.c:
* addressbook/gui/component/addressbook-config.c:
* addressbook/gui/contact-editor/e-contact-editor.c:
* addressbook/gui/widgets/eab-gui-util.c:
* calendar/conduits/calendar/calendar-conduit.c:
* calendar/conduits/memo/memo-conduit.c:
* calendar/conduits/todo/todo-conduit.c:
* calendar/gui/dialogs/alarm-dialog.c:
* calendar/gui/dialogs/event-page.c:
* calendar/gui/dialogs/memo-page.c:
* calendar/gui/dialogs/task-page.c:
* calendar/gui/e-day-view-layout.c:
* calendar/gui/e-day-view-layout.h:
* calendar/gui/print.c:
* e-util/e-pilot-map.c:
* e-util/e-plugin.c:
* e-util/e-profile-event.c:
* e-util/e-signature.c:
* filter/filter-file.c:
* mail/e-searching-tokenizer.c:
* mail/em-folder-browser.c:
* mail/em-format-html.c:
* mail/em-format-view.c:
* mail/em-format.c:
* mail/em-mailer-prefs.c:
* mail/em-mailer-prefs.h:
* mail/mail-session.c:
* mail/mail-session.h:
* mail/mail-vfolder.c:
* mail/message-list.c:
* plugins/bbdb/bbdb.c:
* plugins/bbdb/gaimbuddies.c:
* plugins/calendar-http/calendar-http.c:
* plugins/exchange-operations/exchange-user-dialog.c:
* plugins/face/face.c:
* shell/e-shell-window.c:
* shell/e-shell.c:
* smime/lib/e-cert-db.c:
* tools/killev.c:
* widgets/misc/e-cursors.c:
* widgets/misc/e-spinner.c:
* widgets/misc/e-unicode.c:
* widgets/table/e-table-field-chooser-item.c:
* widgets/table/e-table-header-item.c:
* widgets/table/e-table-header-item.h:
* widgets/table/e-table-header-utils.c:
* widgets/table/e-table.c:
* widgets/text/e-text.c:
Fix various compiler warnings. Patch from Milan Crha.
svn path=/trunk/; revision=34368
Diffstat (limited to 'addressbook/gui/contact-editor')
| -rw-r--r-- | addressbook/gui/contact-editor/e-contact-editor.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index 212225b3e5..6bbc80e9bb 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -2260,12 +2260,15 @@ extract_simple_field (EContactEditor *editor, GtkWidget *widget, gint field_id) photo.data.inlined.mime_type = NULL; if (editor->image_changed) { + gchar *img_buff = NULL; if (editor->image_set && e_image_chooser_get_image_data (E_IMAGE_CHOOSER (widget), - (char **)&photo.data.inlined.data, &photo.data.inlined.length)) { + &img_buff, &photo.data.inlined.length)) { GdkPixbuf *pixbuf, *new; GdkPixbufLoader *loader = gdk_pixbuf_loader_new(); + photo.data.inlined.data = (unsigned char *)img_buff; + img_buff = NULL; gdk_pixbuf_loader_write (loader, photo.data.inlined.data, photo.data.inlined.length, NULL); gdk_pixbuf_loader_close (loader, NULL); @@ -2295,9 +2298,11 @@ extract_simple_field (EContactEditor *editor, GtkWidget *widget, gint field_id) GdkPixbufFormat *format = gdk_pixbuf_loader_get_format (loader); gchar *format_name = gdk_pixbuf_format_get_name (format); g_free(photo.data.inlined.data); - gdk_pixbuf_save_to_buffer (new, (gchar **)&(photo.data.inlined.data), + gdk_pixbuf_save_to_buffer (new, &img_buff, &photo.data.inlined.length, format_name, NULL, NULL); + photo.data.inlined.data = (unsigned char *)img_buff; + img_buff = NULL; g_free (format_name); g_object_unref (new); } |