X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-tny-attachment.c;h=e35fdee32925f95ec25c053b1a990a95910c3aa3;hb=d32d03a825c18a34f52324b009b2e0d1e13b2da4;hp=c16c0b37405b6c7b6a218bdde3ddbd7839899929;hpb=310231acb032d2c72852ce2fe399fc4a92324553;p=modest diff --git a/src/modest-tny-attachment.c b/src/modest-tny-attachment.c index c16c0b3..e35fdee 100644 --- a/src/modest-tny-attachment.c +++ b/src/modest-tny-attachment.c @@ -1,6 +1,34 @@ -/* modest-tny-attachment.c */ +/* Copyright (c) 2006, Nokia Corporation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the Nokia Corporation nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS + * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER + * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + -/* insert (c)/licensing information) */ +/* modest-tny-attachment.c */ #include "modest-tny-attachment.h" #include "modest-tny-msg-actions.h" @@ -181,24 +209,26 @@ modest_tny_attachment_get_mime_type (ModestTnyAttachment *self) } - void modest_tny_attachment_guess_mime_type (ModestTnyAttachment *self) { ModestTnyAttachmentPrivate *priv; - gchar *suffixes[] = {".jpg", ".gif", ".mp3", NULL}; - gchar *types[] = {"image/jpeg", "image/gif", "audio/mpeg", NULL}; + gchar *suffixes[] = {".jpg", ".gif", ".png", ".mp3", ".ogg", /* default: */ "", NULL}; + gchar *types[] = {"image/jpeg", "image/gif", "image/png", "audio/mpeg", "application/ogg", "application/octet-stream", NULL}; + gchar *low_fn; gint pos; priv = MODEST_TNY_ATTACHMENT_GET_PRIVATE(self); if (!priv->filename) return; + low_fn = g_utf8_strdown(priv->filename, -1); for (pos = 0 ; suffixes[pos] ; pos++) { - if (g_str_has_suffix(priv->filename, suffixes[pos])) + if (g_str_has_suffix(low_fn, suffixes[pos])) break; } + g_free(low_fn); g_free(priv->mime_type); if (suffixes[pos]) priv->mime_type = g_strdup(types[pos]); @@ -245,6 +275,7 @@ modest_tny_attachment_get_stream (ModestTnyAttachment *self) void modest_tny_attachment_free_list(GList *list) { + /* this is pretty generic for a GList of GObjects */ GList *pos; for (pos = list; pos; pos = pos->next)