summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2001-02-13 01:53:28 +0000
committerOwen Taylor <otaylor@src.gnome.org>2001-02-13 01:53:28 +0000
commit91383ef28e932bc7edfeb83e677598b417c4927c (patch)
tree8adc317105c5ed37b2d5b7d9fe4e2f16ac7c5f92
parentc17f904633ee25f002690d6506f3cbe2648f10bb (diff)
downloadgdk-pixbuf-91383ef28e932bc7edfeb83e677598b417c4927c.tar.gz
Call gdk_colormap_sync() - fixes #50678.
Mon Feb 12 20:37:32 2001 Owen Taylor <otaylor@redhat.com> * gdk/gdkrgb.c (gdk_rgb_try_colormap): Call gdk_colormap_sync() - fixes #50678. * gdk/gdk.h: Add missing prototype for gdk_colormap_sync().
-rw-r--r--ChangeLog7
-rw-r--r--ChangeLog.pre-2-07
-rw-r--r--ChangeLog.pre-2-107
-rw-r--r--ChangeLog.pre-2-27
-rw-r--r--ChangeLog.pre-2-47
-rw-r--r--ChangeLog.pre-2-67
-rw-r--r--ChangeLog.pre-2-87
-rw-r--r--gdk/gdk.h2
-rw-r--r--gdk/gdkrgb.c2
9 files changed, 53 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 3e79130ab..491d675e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Feb 12 20:37:32 2001 Owen Taylor <otaylor@redhat.com>
+
+ * gdk/gdkrgb.c (gdk_rgb_try_colormap): Call gdk_colormap_sync() -
+ fixes #50678.
+
+ * gdk/gdk.h: Add missing prototype for gdk_colormap_sync().
+
Mon Feb 12 20:02:32 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmain.c: Fix some cases of implicit casting between
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 3e79130ab..491d675e7 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+Mon Feb 12 20:37:32 2001 Owen Taylor <otaylor@redhat.com>
+
+ * gdk/gdkrgb.c (gdk_rgb_try_colormap): Call gdk_colormap_sync() -
+ fixes #50678.
+
+ * gdk/gdk.h: Add missing prototype for gdk_colormap_sync().
+
Mon Feb 12 20:02:32 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmain.c: Fix some cases of implicit casting between
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3e79130ab..491d675e7 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Mon Feb 12 20:37:32 2001 Owen Taylor <otaylor@redhat.com>
+
+ * gdk/gdkrgb.c (gdk_rgb_try_colormap): Call gdk_colormap_sync() -
+ fixes #50678.
+
+ * gdk/gdk.h: Add missing prototype for gdk_colormap_sync().
+
Mon Feb 12 20:02:32 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmain.c: Fix some cases of implicit casting between
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 3e79130ab..491d675e7 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Mon Feb 12 20:37:32 2001 Owen Taylor <otaylor@redhat.com>
+
+ * gdk/gdkrgb.c (gdk_rgb_try_colormap): Call gdk_colormap_sync() -
+ fixes #50678.
+
+ * gdk/gdk.h: Add missing prototype for gdk_colormap_sync().
+
Mon Feb 12 20:02:32 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmain.c: Fix some cases of implicit casting between
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 3e79130ab..491d675e7 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Mon Feb 12 20:37:32 2001 Owen Taylor <otaylor@redhat.com>
+
+ * gdk/gdkrgb.c (gdk_rgb_try_colormap): Call gdk_colormap_sync() -
+ fixes #50678.
+
+ * gdk/gdk.h: Add missing prototype for gdk_colormap_sync().
+
Mon Feb 12 20:02:32 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmain.c: Fix some cases of implicit casting between
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 3e79130ab..491d675e7 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Mon Feb 12 20:37:32 2001 Owen Taylor <otaylor@redhat.com>
+
+ * gdk/gdkrgb.c (gdk_rgb_try_colormap): Call gdk_colormap_sync() -
+ fixes #50678.
+
+ * gdk/gdk.h: Add missing prototype for gdk_colormap_sync().
+
Mon Feb 12 20:02:32 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmain.c: Fix some cases of implicit casting between
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 3e79130ab..491d675e7 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Mon Feb 12 20:37:32 2001 Owen Taylor <otaylor@redhat.com>
+
+ * gdk/gdkrgb.c (gdk_rgb_try_colormap): Call gdk_colormap_sync() -
+ fixes #50678.
+
+ * gdk/gdk.h: Add missing prototype for gdk_colormap_sync().
+
Mon Feb 12 20:02:32 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmain.c: Fix some cases of implicit casting between
diff --git a/gdk/gdk.h b/gdk/gdk.h
index 80cfa04f0..de62dab4a 100644
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -537,6 +537,8 @@ gint gdk_colormap_get_system_size (void);
void gdk_colormap_change (GdkColormap *colormap,
gint ncolors);
+void gdk_colormap_sync (GdkColormap *colormap,
+ gboolean force);
gint gdk_colormap_alloc_colors (GdkColormap *colormap,
GdkColor *colors,
gint ncolors,
diff --git a/gdk/gdkrgb.c b/gdk/gdkrgb.c
index 56ab0e75e..9f0f94d04 100644
--- a/gdk/gdkrgb.c
+++ b/gdk/gdkrgb.c
@@ -239,6 +239,8 @@ gdk_rgb_try_colormap (gint nr, gint ng, gint nb)
else
cmap = gdk_colormap_get_system ();
+ gdk_colormap_sync (cmap, FALSE);
+
colors_needed = nr * ng * nb;
for (i = 0; i < 256; i++)
{