summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-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/linux-fb/gdkcolor-fb.c4
-rw-r--r--gdk/win32/gdkcolor-win32.c2
-rw-r--r--gdk/x11/gdkcolor-x11.c2
10 files changed, 53 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 3a0e49704c..0715d159d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Sep 19 16:16:38 2001 Owen Taylor <otaylor@redhat.com>
+
+ * gdk/win32/gdkcolor-win32.c gdk/x11/gdkcolor-x11.c
+ gdk/linux-fb/gdkcolor-fb.c:
+ Fix propagated (flags && GDK_COLOR_WRITEABLE) typo.
+ (#59723)
+
Wed Sep 19 16:12:16 2001 Owen Taylor <otaylor@redhat.com>
* gdk/gdkpixbuf-render.c: Allow -1 for width/height
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 3a0e49704c..0715d159d5 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+Wed Sep 19 16:16:38 2001 Owen Taylor <otaylor@redhat.com>
+
+ * gdk/win32/gdkcolor-win32.c gdk/x11/gdkcolor-x11.c
+ gdk/linux-fb/gdkcolor-fb.c:
+ Fix propagated (flags && GDK_COLOR_WRITEABLE) typo.
+ (#59723)
+
Wed Sep 19 16:12:16 2001 Owen Taylor <otaylor@redhat.com>
* gdk/gdkpixbuf-render.c: Allow -1 for width/height
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3a0e49704c..0715d159d5 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Wed Sep 19 16:16:38 2001 Owen Taylor <otaylor@redhat.com>
+
+ * gdk/win32/gdkcolor-win32.c gdk/x11/gdkcolor-x11.c
+ gdk/linux-fb/gdkcolor-fb.c:
+ Fix propagated (flags && GDK_COLOR_WRITEABLE) typo.
+ (#59723)
+
Wed Sep 19 16:12:16 2001 Owen Taylor <otaylor@redhat.com>
* gdk/gdkpixbuf-render.c: Allow -1 for width/height
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 3a0e49704c..0715d159d5 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Wed Sep 19 16:16:38 2001 Owen Taylor <otaylor@redhat.com>
+
+ * gdk/win32/gdkcolor-win32.c gdk/x11/gdkcolor-x11.c
+ gdk/linux-fb/gdkcolor-fb.c:
+ Fix propagated (flags && GDK_COLOR_WRITEABLE) typo.
+ (#59723)
+
Wed Sep 19 16:12:16 2001 Owen Taylor <otaylor@redhat.com>
* gdk/gdkpixbuf-render.c: Allow -1 for width/height
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 3a0e49704c..0715d159d5 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Wed Sep 19 16:16:38 2001 Owen Taylor <otaylor@redhat.com>
+
+ * gdk/win32/gdkcolor-win32.c gdk/x11/gdkcolor-x11.c
+ gdk/linux-fb/gdkcolor-fb.c:
+ Fix propagated (flags && GDK_COLOR_WRITEABLE) typo.
+ (#59723)
+
Wed Sep 19 16:12:16 2001 Owen Taylor <otaylor@redhat.com>
* gdk/gdkpixbuf-render.c: Allow -1 for width/height
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 3a0e49704c..0715d159d5 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Wed Sep 19 16:16:38 2001 Owen Taylor <otaylor@redhat.com>
+
+ * gdk/win32/gdkcolor-win32.c gdk/x11/gdkcolor-x11.c
+ gdk/linux-fb/gdkcolor-fb.c:
+ Fix propagated (flags && GDK_COLOR_WRITEABLE) typo.
+ (#59723)
+
Wed Sep 19 16:12:16 2001 Owen Taylor <otaylor@redhat.com>
* gdk/gdkpixbuf-render.c: Allow -1 for width/height
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 3a0e49704c..0715d159d5 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Wed Sep 19 16:16:38 2001 Owen Taylor <otaylor@redhat.com>
+
+ * gdk/win32/gdkcolor-win32.c gdk/x11/gdkcolor-x11.c
+ gdk/linux-fb/gdkcolor-fb.c:
+ Fix propagated (flags && GDK_COLOR_WRITEABLE) typo.
+ (#59723)
+
Wed Sep 19 16:12:16 2001 Owen Taylor <otaylor@redhat.com>
* gdk/gdkpixbuf-render.c: Allow -1 for width/height
diff --git a/gdk/linux-fb/gdkcolor-fb.c b/gdk/linux-fb/gdkcolor-fb.c
index 57428bfea8..e4882fb548 100644
--- a/gdk/linux-fb/gdkcolor-fb.c
+++ b/gdk/linux-fb/gdkcolor-fb.c
@@ -527,7 +527,7 @@ gdk_colormap_alloc1 (GdkColormap *colormap,
for (i = 0; i<colormap->size; i++)
{
- if (!(private->info[i].flags && GDK_COLOR_WRITEABLE) &&
+ if (!(private->info[i].flags & GDK_COLOR_WRITEABLE) &&
(ret->red == colormap->colors[i].red) &&
(ret->green == colormap->colors[i].green) &&
(ret->blue == colormap->colors[i].blue))
@@ -605,7 +605,7 @@ gdk_colormap_alloc_colors_shared (GdkColormap *colormap,
for (i = 0; i < colormap->size; i++)
available[i] = ((private->info[i].ref_count == 0) ||
- !(private->info[i].flags && GDK_COLOR_WRITEABLE));
+ !(private->info[i].flags & GDK_COLOR_WRITEABLE));
while (nremaining > 0)
{
diff --git a/gdk/win32/gdkcolor-win32.c b/gdk/win32/gdkcolor-win32.c
index f7a6c3ebcd..c857f3ebb9 100644
--- a/gdk/win32/gdkcolor-win32.c
+++ b/gdk/win32/gdkcolor-win32.c
@@ -1976,7 +1976,7 @@ gdk_colormap_alloc_colors_shared (GdkColormap *colormap,
gchar *available = g_new (gchar, colormap->size);
for (i = 0; i < colormap->size; i++)
available[i] = ((private->info[i].ref_count == 0) ||
- !(private->info[i].flags && GDK_COLOR_WRITEABLE));
+ !(private->info[i].flags & GDK_COLOR_WRITEABLE));
gdk_colormap_sync (colormap, FALSE);
while (nremaining > 0)
diff --git a/gdk/x11/gdkcolor-x11.c b/gdk/x11/gdkcolor-x11.c
index 13b99e0ba0..e6a2abae5c 100644
--- a/gdk/x11/gdkcolor-x11.c
+++ b/gdk/x11/gdkcolor-x11.c
@@ -815,7 +815,7 @@ gdk_colormap_alloc_colors_shared (GdkColormap *colormap,
gchar *available = g_new (gchar, colormap->size);
for (i = 0; i < colormap->size; i++)
available[i] = ((private->info[i].ref_count == 0) ||
- !(private->info[i].flags && GDK_COLOR_WRITEABLE));
+ !(private->info[i].flags & GDK_COLOR_WRITEABLE));
gdk_colormap_sync (colormap, FALSE);
while (nremaining > 0)
View Lorry Controller Status