Fix reversed assertion. (Pointed out by Austin Donnelly

Sun Jan 24 12:17:39 1999  Owen Taylor  <otaylor@redhat.com>

	* gdk/gdkcolor.c (gdk_colormap_real_destroy): Fix
	 reversed assertion.
	 (Pointed out by Austin Donnelly <austin@greenend.org.uk>)

	* gtk/gtkruler.c (gtk_ruler_expose): Remove unecessary
	 and harmful call to gtk_paint_box(). We are going
	 to paint onto the backing store later anyways.

diff --git a/ChangeLog b/ChangeLog
index d9f2210615857aa37446fc934d63ac04d5a706ca..25ca0edbe66398869a3b79cce154cb3a8e9f031f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Sun Jan 24 12:17:39 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdkcolor.c (gdk_colormap_real_destroy): Fix 
+        reversed assertion. 
+        (Pointed out by Austin Donnelly <austin@greenend.org.uk>)
+
+       * gtk/gtkruler.c (gtk_ruler_expose): Remove unecessary
+        and harmful call to gtk_paint_box(). We are going
+        to paint onto the backing store later anyways.
+
 Sat Jan 23 11:15:39 1999  Owen Taylor  <otaylor@gtk.org>
 
        * gdk/gdkdnd.c (gdk_window_register_dnd): X expects

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index d9f2210615857aa37446fc934d63ac04d5a706ca..25ca0edbe66398869a3b79cce154cb3a8e9f031f 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,13 @@
+Sun Jan 24 12:17:39 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdkcolor.c (gdk_colormap_real_destroy): Fix 
+        reversed assertion. 
+        (Pointed out by Austin Donnelly <austin@greenend.org.uk>)
+
+       * gtk/gtkruler.c (gtk_ruler_expose): Remove unecessary
+        and harmful call to gtk_paint_box(). We are going
+        to paint onto the backing store later anyways.
+
 Sat Jan 23 11:15:39 1999  Owen Taylor  <otaylor@gtk.org>
 
        * gdk/gdkdnd.c (gdk_window_register_dnd): X expects

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d9f2210615857aa37446fc934d63ac04d5a706ca..25ca0edbe66398869a3b79cce154cb3a8e9f031f 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,13 @@
+Sun Jan 24 12:17:39 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdkcolor.c (gdk_colormap_real_destroy): Fix 
+        reversed assertion. 
+        (Pointed out by Austin Donnelly <austin@greenend.org.uk>)
+
+       * gtk/gtkruler.c (gtk_ruler_expose): Remove unecessary
+        and harmful call to gtk_paint_box(). We are going
+        to paint onto the backing store later anyways.
+
 Sat Jan 23 11:15:39 1999  Owen Taylor  <otaylor@gtk.org>
 
        * gdk/gdkdnd.c (gdk_window_register_dnd): X expects

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index d9f2210615857aa37446fc934d63ac04d5a706ca..25ca0edbe66398869a3b79cce154cb3a8e9f031f 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,13 @@
+Sun Jan 24 12:17:39 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdkcolor.c (gdk_colormap_real_destroy): Fix 
+        reversed assertion. 
+        (Pointed out by Austin Donnelly <austin@greenend.org.uk>)
+
+       * gtk/gtkruler.c (gtk_ruler_expose): Remove unecessary
+        and harmful call to gtk_paint_box(). We are going
+        to paint onto the backing store later anyways.
+
 Sat Jan 23 11:15:39 1999  Owen Taylor  <otaylor@gtk.org>
 
        * gdk/gdkdnd.c (gdk_window_register_dnd): X expects

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index d9f2210615857aa37446fc934d63ac04d5a706ca..25ca0edbe66398869a3b79cce154cb3a8e9f031f 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,13 @@
+Sun Jan 24 12:17:39 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdkcolor.c (gdk_colormap_real_destroy): Fix 
+        reversed assertion. 
+        (Pointed out by Austin Donnelly <austin@greenend.org.uk>)
+
+       * gtk/gtkruler.c (gtk_ruler_expose): Remove unecessary
+        and harmful call to gtk_paint_box(). We are going
+        to paint onto the backing store later anyways.
+
 Sat Jan 23 11:15:39 1999  Owen Taylor  <otaylor@gtk.org>
 
        * gdk/gdkdnd.c (gdk_window_register_dnd): X expects

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d9f2210615857aa37446fc934d63ac04d5a706ca..25ca0edbe66398869a3b79cce154cb3a8e9f031f 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,13 @@
+Sun Jan 24 12:17:39 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdkcolor.c (gdk_colormap_real_destroy): Fix 
+        reversed assertion. 
+        (Pointed out by Austin Donnelly <austin@greenend.org.uk>)
+
+       * gtk/gtkruler.c (gtk_ruler_expose): Remove unecessary
+        and harmful call to gtk_paint_box(). We are going
+        to paint onto the backing store later anyways.
+
 Sat Jan 23 11:15:39 1999  Owen Taylor  <otaylor@gtk.org>
 
        * gdk/gdkdnd.c (gdk_window_register_dnd): X expects

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d9f2210615857aa37446fc934d63ac04d5a706ca..25ca0edbe66398869a3b79cce154cb3a8e9f031f 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,13 @@
+Sun Jan 24 12:17:39 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdkcolor.c (gdk_colormap_real_destroy): Fix 
+        reversed assertion. 
+        (Pointed out by Austin Donnelly <austin@greenend.org.uk>)
+
+       * gtk/gtkruler.c (gtk_ruler_expose): Remove unecessary
+        and harmful call to gtk_paint_box(). We are going
+        to paint onto the backing store later anyways.
+
 Sat Jan 23 11:15:39 1999  Owen Taylor  <otaylor@gtk.org>
 
        * gdk/gdkdnd.c (gdk_window_register_dnd): X expects

diff --git a/gdk/gdkcolor.c b/gdk/gdkcolor.c
index f84f570255b4fd409c0d66e8803184ea972e038a..41f6286de7f4dafc7d3d3134df1df7bcc4a52ac7 100644 (file)
--- a/gdk/gdkcolor.c
+++ b/gdk/gdkcolor.c
@@ -145,7 +145,7 @@ gdk_colormap_real_destroy (GdkColormap *colormap)
   GdkColormapPrivate *private = (GdkColormapPrivate*) colormap;
 
   g_return_if_fail (colormap != NULL);
-  g_return_if_fail (private->ref_count > 0);
+  g_return_if_fail (private->ref_count == 0);
 
   gdk_colormap_remove (colormap);
   XFreeColormap (private->xdisplay, private->xcolormap);

diff --git a/gdk/x11/gdkcolor-x11.c b/gdk/x11/gdkcolor-x11.c
index f84f570255b4fd409c0d66e8803184ea972e038a..41f6286de7f4dafc7d3d3134df1df7bcc4a52ac7 100644 (file)
--- a/gdk/x11/gdkcolor-x11.c
+++ b/gdk/x11/gdkcolor-x11.c
@@ -145,7 +145,7 @@ gdk_colormap_real_destroy (GdkColormap *colormap)
   GdkColormapPrivate *private = (GdkColormapPrivate*) colormap;
 
   g_return_if_fail (colormap != NULL);
-  g_return_if_fail (private->ref_count > 0);
+  g_return_if_fail (private->ref_count == 0);
 
   gdk_colormap_remove (colormap);
   XFreeColormap (private->xdisplay, private->xcolormap);

diff --git a/gtk/gtkruler.c b/gtk/gtkruler.c
index d5c2273f673203e39f2bcabef49ae8d799deabe2..e8c1d258f20bab530e5b835f639a02545c133b75 100644 (file)
--- a/gtk/gtkruler.c
+++ b/gtk/gtkruler.c
@@ -249,11 +249,6 @@ gtk_ruler_expose (GtkWidget      *widget,
     {
       ruler = GTK_RULER (widget);
 
-      gtk_paint_box (widget->style, widget->window,
-                    GTK_STATE_NORMAL, GTK_SHADOW_OUT, 
-                    NULL, widget, "ruler",
-                    0, 0, -1, -1);
-      
       gtk_ruler_draw_ticks (ruler);
       
       gdk_draw_pixmap (widget->window,