diff --git a/ChangeLog b/ChangeLog index f4d1df4353..c29d33e4d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-09-25 Matthias Clasen + + * gdk/x11/gdkwindow-x11.c (gdk_window_impl_x11_get_colormap): + Replace leftover gdk_colormap_lookup () by + gdk_x11_colormap_foreign_new () to make the linker happy. + Tue Sep 24 17:49:52 2002 Owen Taylor * gtk/gtkaccelgroup.[ch] (gtk_accel_group_find): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index f4d1df4353..c29d33e4d6 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2002-09-25 Matthias Clasen + + * gdk/x11/gdkwindow-x11.c (gdk_window_impl_x11_get_colormap): + Replace leftover gdk_colormap_lookup () by + gdk_x11_colormap_foreign_new () to make the linker happy. + Tue Sep 24 17:49:52 2002 Owen Taylor * gtk/gtkaccelgroup.[ch] (gtk_accel_group_find): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index f4d1df4353..c29d33e4d6 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +2002-09-25 Matthias Clasen + + * gdk/x11/gdkwindow-x11.c (gdk_window_impl_x11_get_colormap): + Replace leftover gdk_colormap_lookup () by + gdk_x11_colormap_foreign_new () to make the linker happy. + Tue Sep 24 17:49:52 2002 Owen Taylor * gtk/gtkaccelgroup.[ch] (gtk_accel_group_find): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index f4d1df4353..c29d33e4d6 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +2002-09-25 Matthias Clasen + + * gdk/x11/gdkwindow-x11.c (gdk_window_impl_x11_get_colormap): + Replace leftover gdk_colormap_lookup () by + gdk_x11_colormap_foreign_new () to make the linker happy. + Tue Sep 24 17:49:52 2002 Owen Taylor * gtk/gtkaccelgroup.[ch] (gtk_accel_group_find): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index f4d1df4353..c29d33e4d6 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2002-09-25 Matthias Clasen + + * gdk/x11/gdkwindow-x11.c (gdk_window_impl_x11_get_colormap): + Replace leftover gdk_colormap_lookup () by + gdk_x11_colormap_foreign_new () to make the linker happy. + Tue Sep 24 17:49:52 2002 Owen Taylor * gtk/gtkaccelgroup.[ch] (gtk_accel_group_find): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index f4d1df4353..c29d33e4d6 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2002-09-25 Matthias Clasen + + * gdk/x11/gdkwindow-x11.c (gdk_window_impl_x11_get_colormap): + Replace leftover gdk_colormap_lookup () by + gdk_x11_colormap_foreign_new () to make the linker happy. + Tue Sep 24 17:49:52 2002 Owen Taylor * gtk/gtkaccelgroup.[ch] (gtk_accel_group_find): diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c index 9291a8ebaa..f76e71971a 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -203,7 +203,8 @@ gdk_window_impl_x11_get_colormap (GdkDrawable *drawable) drawable_impl->xid, &window_attributes); drawable_impl->colormap = - gdk_colormap_lookup (window_attributes.colormap); + gdk_x11_colormap_foreign_new (gdk_drawable_get_visual (drawable), + window_attributes.colormap); } return drawable_impl->colormap;