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 --- gtk/scaffolding.c | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'gtk/scaffolding.c') 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; -- cgit v1.2.3