--- client/gui-gtk/graphics.c.orig	Fri Nov  9 15:53:00 2001
+++ client/gui-gtk/graphics.c	Tue Dec  4 22:34:31 2001
@@ -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 */
 
@@ -290,9 +293,6 @@
   static char *ext[] =
   {
     "xpm",
-#ifdef HAVE_LIBPNG
-    "png",
-#endif
     NULL
   };
 
@@ -340,7 +340,7 @@
 ***************************************************************************/
 void free_sprite(SPRITE *s)
 {
-  gdk_imlib_free_pixmap(s->pixmap);
+  gdk_pixmap_unref(s->pixmap);
   free(s);
   return;
 }
--- client/gui-gtk/colors.c.orig	Fri Nov  9 17:44:20 2001
+++ client/gui-gtk/colors.c	Tue Dec  4 22:34:24 2001
@@ -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 */