Merge branch 'master' into native-layoutnative-layout

Conflicts:
	gtk/gtkplug.c
	gtk/gtkscrolledwindow.c

1 files changed, 0 insertions, 8 deletions

diff --git a/gdk/win32/gdkvisual-win32.c b/gdk/win32/gdkvisual-win32.c
index 440f6ce844..b3d20b7031 100644
--- a/gdk/win32/gdkvisual-win32.c
+++ b/gdk/win32/gdkvisual-win32.c
@@ -122,34 +122,26 @@ _gdk_visual_init (void)
 
       if (map_entries >= 16 && map_entries < sizepalette)
 	{
-	  /* The calls to gdk_rgb_set_min_colors() here have knowledge
-	   * of what color cubes gdk_rgb_do_colormaps() will try, and
-	   * of the static system palette colors... XXX
-	   */
 	  if (map_entries < 32)
 	    {
 	      map_entries = 16;
 	      system_visual->type = GDK_VISUAL_STATIC_COLOR;
 	      bitspixel = 4;
-	      gdk_rgb_set_min_colors (2*2*2);
 	    }
 	  else if (map_entries < 64)
 	    {
 	      map_entries = 32;
 	      bitspixel = 5;
-	      gdk_rgb_set_min_colors (3*3*3);
 	    }
 	  else if (map_entries < 128)
 	    {
 	      map_entries = 64;
 	      bitspixel = 6;
-	      gdk_rgb_set_min_colors (3*3*3);
 	    }
 	  else if (map_entries < 256)
 	    {
 	      map_entries = 128;
 	      bitspixel = 7;
-	      gdk_rgb_set_min_colors (5*5*4);
 	    }
 	  else
 	    g_assert_not_reached ();