diff options
| author | John Mark Bell <jmb@netsurf-browser.org> | 2011-05-06 20:40:09 +0000 |
|---|---|---|
| committer | John Mark Bell <jmb@netsurf-browser.org> | 2011-05-06 20:40:09 +0000 |
| commit | e71691bae890040b83cfd54a2d9a1097d5026866 (patch) | |
| tree | 96b2680dc6559ca0ab88fa0b6a533c13b7c9487e /beos | |
| parent | e77b1a29550e4753f771848705975295a6ebe99e (diff) | |
| download | netsurf-e71691bae890040b83cfd54a2d9a1097d5026866.tar.gz netsurf-e71691bae890040b83cfd54a2d9a1097d5026866.tar.bz2 | |
Merge branches/jmb/content-factory to trunk
svn path=/trunk/netsurf/; revision=12283
Diffstat (limited to 'beos')
| -rw-r--r-- | beos/beos_save_complete.cpp | 2 | ||||
| -rw-r--r-- | beos/beos_treeview.cpp | 30 |
2 files changed, 2 insertions, 30 deletions
diff --git a/beos/beos_save_complete.cpp b/beos/beos_save_complete.cpp index c922cd72f..19306dc21 100644 --- a/beos/beos_save_complete.cpp +++ b/beos/beos_save_complete.cpp @@ -39,7 +39,7 @@ extern "C" { */ bool save_complete_gui_save(const char *path, const char *filename, - size_t len, const char *sourcedata, content_type type) + size_t len, const char *sourcedata, lwc_string *mime_type) { int res; int namelen; diff --git a/beos/beos_treeview.cpp b/beos/beos_treeview.cpp index 6763c25b8..4728995ad 100644 --- a/beos/beos_treeview.cpp +++ b/beos/beos_treeview.cpp @@ -48,35 +48,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; |