[evolution] Bug 707043 - Audio attachment not shown correctly

[Matthew Barnes <mbarnes src gnome org>]

commit 58a18a14c13143855fe09df4e2a582ca170ea35c
Author: David Woodhouse <dwmw2 infradead org>
Date:   Sat Aug 31 10:41:02 2013 -0400

    Bug 707043 - Audio attachment not shown correctly

 modules/audio-inline/e-mail-formatter-audio.c |    4 +++-
 modules/audio-inline/e-mail-parser-audio.c    |    4 ++++
 2 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/modules/audio-inline/e-mail-formatter-audio.c b/modules/audio-inline/e-mail-formatter-audio.c
index fc27bb7..f1535a6 100644
--- a/modules/audio-inline/e-mail-formatter-audio.c
+++ b/modules/audio-inline/e-mail-formatter-audio.c
@@ -69,6 +69,8 @@ static const gchar *formatter_mime_types[] = {
        "audio/microsoft-wav",
        "audio/x-wma",
        "audio/x-ms-wma",
+       "audio/ogg",
+       "audio/x-vorbis+ogg",
        "application/ogg",
        "application/x-ogg",
        NULL
@@ -184,7 +186,7 @@ play_clicked (GtkWidget *button,
                /* FIXME this is ugly, we should stream this directly to gstreamer */
                part->filename = e_mktemp ("org-gnome-audio-file-XXXXXX");
 
-               d (printf ("audio formatter: write to temp file %s\n", po->filename));
+               d (printf ("audio formatter: write to temp file %s\n", part->filename));
 
                stream = camel_stream_fs_new_with_name (
                        part->filename, O_RDWR | O_CREAT | O_TRUNC, 0600, NULL);
diff --git a/modules/audio-inline/e-mail-parser-audio.c b/modules/audio-inline/e-mail-parser-audio.c
index 0e16564..9fed607 100644
--- a/modules/audio-inline/e-mail-parser-audio.c
+++ b/modules/audio-inline/e-mail-parser-audio.c
@@ -69,6 +69,8 @@ static const gchar *parser_mime_types[] = {
        "audio/microsoft-wav",
        "audio/x-wma",
        "audio/x-ms-wma",
+       "audio/ogg",
+       "audio/x-vorbis+ogg",
        "application/ogg",
        "application/x-ogg",
        NULL
@@ -89,6 +91,8 @@ mail_parser_audio_parse (EMailParserExtension *extension,
        len = part_id->len;
        g_string_append (part_id, ".org-gnome-audio-button-panel");
 
+       camel_mime_part_set_disposition (part, "inline");
+
        d (printf ("audio formatter: format classid %s\n", part_id->str));
 
        mail_part = e_mail_part_audio_new (part, part_id->str);