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 /gtk | |
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 'gtk')
-rw-r--r-- | gtk/save.c | 2 | ||||
-rw-r--r-- | gtk/scaffolding.c | 10 | ||||
-rw-r--r-- | gtk/treeview.c | 30 |
3 files changed, 2 insertions, 40 deletions
diff --git a/gtk/save.c b/gtk/save.c index a67a7e6d0..2efba7d3b 100644 --- a/gtk/save.c +++ b/gtk/save.c @@ -36,7 +36,7 @@ */ 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/gtk/scaffolding.c b/gtk/scaffolding.c index 83b19ead1..a2b6c5460 100644 --- a/gtk/scaffolding.c +++ b/gtk/scaffolding.c @@ -1994,11 +1994,6 @@ void gui_window_set_icon(struct gui_window *_g, hlcache_handle *icon) if (g->top_level != _g) return; -#ifdef WITH_BMP - if (icon != NULL && content_get_type(icon) == CONTENT_ICO) - nsico_set_bitmap_from_size(icon, 16, 16); -#endif - icon_bitmap = (icon != NULL) ? content_get_bitmap(icon) : NULL; if (icon_bitmap != NULL) { @@ -2039,11 +2034,6 @@ void gui_window_set_search_ico(hlcache_handle *ico) if (ico == NULL && (ico = search_web_ico()) == NULL) return; -#ifdef WITH_BMP - if (content_get_type(ico) == CONTENT_ICO) - nsico_set_bitmap_from_size(ico, 20, 20); -#endif - ico_bitmap = content_get_bitmap(ico); if (ico_bitmap == NULL) return; diff --git a/gtk/treeview.c b/gtk/treeview.c index b6c1c36bb..a56a28dfd 100644 --- a/gtk/treeview.c +++ b/gtk/treeview.c @@ -98,35 +98,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; |