Index: freeciv/client/gui-gtk/colors.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk/colors.c,v retrieving revision 1.6 diff -u -r1.6 colors.c --- freeciv/client/gui-gtk/colors.c 2001/02/06 20:30:59 1.6 +++ freeciv/client/gui-gtk/colors.c 2001/12/05 21:19:08 @@ -66,7 +66,9 @@ colors_standard[i]->green= colors_standard_rgb[i].g<<8; colors_standard[i]->blue = colors_standard_rgb[i].b<<8; - gdk_imlib_best_color_get (colors_standard[i]); + if (!gdk_colormap_alloc_color(cmap,colors_standard[i],FALSE,TRUE)) { + freelog(LOG_FATAL,"Couldn't allocate color: %d",i); + } } } @@ -79,10 +81,10 @@ gdk_imlib_init(); - gtk_widget_push_visual (gdk_imlib_get_visual()); - gtk_widget_push_colormap (gdk_imlib_get_colormap()); + visual = gdk_visual_get_system(); - visual = gdk_imlib_get_visual(); + gtk_widget_push_visual (visual); + gtk_widget_push_colormap (gdk_colormap_get_system()); if (visual->type == GDK_VISUAL_STATIC_GRAY) { /* StaticGray, use black and white */ Index: freeciv/client/gui-gtk/graphics.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk/graphics.c,v retrieving revision 1.32 diff -u -r1.32 graphics.c --- freeciv/client/gui-gtk/graphics.c 2001/09/09 09:03:18 1.32 +++ freeciv/client/gui-gtk/graphics.c 2001/12/05 21:19:09 @@ -87,6 +87,7 @@ char s[64]; GdkColor face; GdkGC *face_gc; + GdkColormap *comap; char *motto = freeciv_motto(); /* metrics */ @@ -99,7 +100,9 @@ face.green= COLOR_MOTTO_FACE_G<<8; face.blue = COLOR_MOTTO_FACE_B<<8; - gdk_imlib_best_color_get (&face); + comap = gdk_colormap_get_system(); + gdk_colormap_alloc_color(comap,&face,FALSE,TRUE); + gdk_colormap_unref(comap); /* Main graphic */ @@ -337,7 +340,7 @@ ***************************************************************************/ void free_sprite(SPRITE *s) { - gdk_imlib_free_pixmap(s->pixmap); + gdk_pixmap_unref(s->pixmap); free(s); return; }