From e71691bae890040b83cfd54a2d9a1097d5026866 Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Fri, 6 May 2011 20:40:09 +0000 Subject: Merge branches/jmb/content-factory to trunk svn path=/trunk/netsurf/; revision=12283 --- windows/gui.c | 2 +- windows/tree.c | 30 +----------------------------- 2 files changed, 2 insertions(+), 30 deletions(-) (limited to 'windows') diff --git a/windows/gui.c b/windows/gui.c index 4e87c0739..5c5fed48a 100644 --- a/windows/gui.c +++ b/windows/gui.c @@ -1733,7 +1733,7 @@ save_complete_gui_save(const char *path, const char *filename, size_t len, const char *sourcedata, - content_type type) + lwc_string *mime_type) { return false; } diff --git a/windows/tree.c b/windows/tree.c index c67e50bc4..ec0750be4 100644 --- a/windows/tree.c +++ b/windows/tree.c @@ -37,35 +37,7 @@ void tree_icon_name_from_content_type(char *buffer, content_type type) case CONTENT_HTML: case CONTENT_TEXTPLAIN: case CONTENT_CSS: -#if defined(WITH_MNG) || defined(WITH_PNG) - case CONTENT_PNG: -#endif -#ifdef WITH_MNG - case CONTENT_JNG: - case CONTENT_MNG: -#endif -#ifdef WITH_JPEG - case CONTENT_JPEG: -#endif -#ifdef WITH_GIF - case CONTENT_GIF: -#endif -#ifdef WITH_BMP - case CONTENT_BMP: - case CONTENT_ICO: -#endif -#ifdef WITH_SPRITE - case CONTENT_SPRITE: -#endif -#ifdef WITH_DRAW - case CONTENT_DRAW: -#endif -#ifdef WITH_ARTWORKS - case CONTENT_ARTWORKS: -#endif -#ifdef WITH_NS_SVG - case CONTENT_SVG: -#endif + case CONTENT_IMAGE: default: sprintf(buffer, tree_content_icon_name); break; -- cgit v1.2.3