diff --git a/ChangeLog b/ChangeLog
index e789b4fc17..37ed0c60c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-21  Sven Neumann  <sven@gimp.org>
+
+	* gtk/gtkwidget.c (gtk_widget_create_pango_context): removed call
+	to gdk_pango_context_set_colormap() which isn't needed any longer.
+
 2004-11-21  Hans Breuer  <hans@breuer.org>
 
 	* gdk/makefile.msc.in gtk/stock-icons/makefile.msc 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e789b4fc17..37ed0c60c7 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2004-11-21  Sven Neumann  <sven@gimp.org>
+
+	* gtk/gtkwidget.c (gtk_widget_create_pango_context): removed call
+	to gdk_pango_context_set_colormap() which isn't needed any longer.
+
 2004-11-21  Hans Breuer  <hans@breuer.org>
 
 	* gdk/makefile.msc.in gtk/stock-icons/makefile.msc 
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e789b4fc17..37ed0c60c7 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2004-11-21  Sven Neumann  <sven@gimp.org>
+
+	* gtk/gtkwidget.c (gtk_widget_create_pango_context): removed call
+	to gdk_pango_context_set_colormap() which isn't needed any longer.
+
 2004-11-21  Hans Breuer  <hans@breuer.org>
 
 	* gdk/makefile.msc.in gtk/stock-icons/makefile.msc 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e789b4fc17..37ed0c60c7 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2004-11-21  Sven Neumann  <sven@gimp.org>
+
+	* gtk/gtkwidget.c (gtk_widget_create_pango_context): removed call
+	to gdk_pango_context_set_colormap() which isn't needed any longer.
+
 2004-11-21  Hans Breuer  <hans@breuer.org>
 
 	* gdk/makefile.msc.in gtk/stock-icons/makefile.msc 
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index eefa3ee9c2..6de6e489e5 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -5009,13 +5009,12 @@ gtk_widget_create_pango_context (GtkWidget *widget)
     {
       GTK_NOTE (MULTIHEAD,
 		g_warning ("gtk_widget_create_pango_context ()) called without screen"));
-      
+
       screen = gdk_screen_get_default ();
     }
 
   context = gdk_pango_context_get_for_screen (screen);
 
-  gdk_pango_context_set_colormap (context, gtk_widget_get_colormap (widget));
   pango_context_set_base_dir (context,
 			      gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR ?
 			        PANGO_DIRECTION_LTR : PANGO_DIRECTION_RTL);