From e71691bae890040b83cfd54a2d9a1097d5026866 Mon Sep 17 00:00:00 2001
From: John Mark Bell <jmb@netsurf-browser.org>
Date: Fri, 6 May 2011 20:40:09 +0000
Subject: Merge branches/jmb/content-factory to trunk

svn path=/trunk/netsurf/; revision=12283
---
 cocoa/gui.m | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'cocoa/gui.m')

diff --git a/cocoa/gui.m b/cocoa/gui.m
index f3a0b04a2..0ffc44543 100644
--- a/cocoa/gui.m
+++ b/cocoa/gui.m
@@ -258,11 +258,6 @@ void gui_window_stop_throbber(struct gui_window *g)
 
 void gui_window_set_icon(struct gui_window *g, hlcache_handle *icon)
 {
-#ifdef WITH_BMP
-	if (icon != NULL && content_get_type( icon ) == CONTENT_ICO)
-		nsico_set_bitmap_from_size( icon, 16, 16 );
-#endif
-
 	NSBitmapImageRep *bmp = icon != NULL ? (NSBitmapImageRep *)content_get_bitmap( icon ) : NULL;
 
 	NSImage *image = nil;
-- 
cgit v1.2.3