Fixed cut and paste bug when comparing text property bg colors. [ Matt

Sun Jan 10 14:45:37 1999  Owen Taylor  <otaylor@gtk.org>

	* gtk/gtktext.c (text_properties_equal): Fixed
	cut and paste bug when comparing text property
	bg colors.
	[ Matt Aubury <Matt.Aubury@comlab.ox.ac.uk> ]

diff --git a/ChangeLog b/ChangeLog
index 0b5ece2670256b343142088658b7790c082f0bfc..5af9a5897706d60e618edc47b965ac11111d78d9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun Jan 10 14:45:37 1999  Owen Taylor  <otaylor@gtk.org>
+
+       * gtk/gtktext.c (text_properties_equal): Fixed
+       cut and paste bug when comparing text property
+       bg colors.
+       [ Matt Aubury <Matt.Aubury@comlab.ox.ac.uk> ]
+
 1999-01-10  Tim Janik  <timj@gtk.org>
 
        * gtk/gtksignal.c (gtk_signal_lookup): if the lookup failed, try

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 0b5ece2670256b343142088658b7790c082f0bfc..5af9a5897706d60e618edc47b965ac11111d78d9 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+Sun Jan 10 14:45:37 1999  Owen Taylor  <otaylor@gtk.org>
+
+       * gtk/gtktext.c (text_properties_equal): Fixed
+       cut and paste bug when comparing text property
+       bg colors.
+       [ Matt Aubury <Matt.Aubury@comlab.ox.ac.uk> ]
+
 1999-01-10  Tim Janik  <timj@gtk.org>
 
        * gtk/gtksignal.c (gtk_signal_lookup): if the lookup failed, try

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0b5ece2670256b343142088658b7790c082f0bfc..5af9a5897706d60e618edc47b965ac11111d78d9 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Sun Jan 10 14:45:37 1999  Owen Taylor  <otaylor@gtk.org>
+
+       * gtk/gtktext.c (text_properties_equal): Fixed
+       cut and paste bug when comparing text property
+       bg colors.
+       [ Matt Aubury <Matt.Aubury@comlab.ox.ac.uk> ]
+
 1999-01-10  Tim Janik  <timj@gtk.org>
 
        * gtk/gtksignal.c (gtk_signal_lookup): if the lookup failed, try

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 0b5ece2670256b343142088658b7790c082f0bfc..5af9a5897706d60e618edc47b965ac11111d78d9 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Sun Jan 10 14:45:37 1999  Owen Taylor  <otaylor@gtk.org>
+
+       * gtk/gtktext.c (text_properties_equal): Fixed
+       cut and paste bug when comparing text property
+       bg colors.
+       [ Matt Aubury <Matt.Aubury@comlab.ox.ac.uk> ]
+
 1999-01-10  Tim Janik  <timj@gtk.org>
 
        * gtk/gtksignal.c (gtk_signal_lookup): if the lookup failed, try

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 0b5ece2670256b343142088658b7790c082f0bfc..5af9a5897706d60e618edc47b965ac11111d78d9 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Sun Jan 10 14:45:37 1999  Owen Taylor  <otaylor@gtk.org>
+
+       * gtk/gtktext.c (text_properties_equal): Fixed
+       cut and paste bug when comparing text property
+       bg colors.
+       [ Matt Aubury <Matt.Aubury@comlab.ox.ac.uk> ]
+
 1999-01-10  Tim Janik  <timj@gtk.org>
 
        * gtk/gtksignal.c (gtk_signal_lookup): if the lookup failed, try

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 0b5ece2670256b343142088658b7790c082f0bfc..5af9a5897706d60e618edc47b965ac11111d78d9 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Sun Jan 10 14:45:37 1999  Owen Taylor  <otaylor@gtk.org>
+
+       * gtk/gtktext.c (text_properties_equal): Fixed
+       cut and paste bug when comparing text property
+       bg colors.
+       [ Matt Aubury <Matt.Aubury@comlab.ox.ac.uk> ]
+
 1999-01-10  Tim Janik  <timj@gtk.org>
 
        * gtk/gtksignal.c (gtk_signal_lookup): if the lookup failed, try

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 0b5ece2670256b343142088658b7790c082f0bfc..5af9a5897706d60e618edc47b965ac11111d78d9 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Sun Jan 10 14:45:37 1999  Owen Taylor  <otaylor@gtk.org>
+
+       * gtk/gtktext.c (text_properties_equal): Fixed
+       cut and paste bug when comparing text property
+       bg colors.
+       [ Matt Aubury <Matt.Aubury@comlab.ox.ac.uk> ]
+
 1999-01-10  Tim Janik  <timj@gtk.org>
 
        * gtk/gtksignal.c (gtk_signal_lookup): if the lookup failed, try

diff --git a/gtk/gtktext.c b/gtk/gtktext.c
index 78dffac1b6263ba67911e07de4c5a07479c57d87..7b69ea6ee425c447165562c71d1e2803675706b4 100644 (file)
--- a/gtk/gtktext.c
+++ b/gtk/gtktext.c
@@ -2975,11 +2975,11 @@ text_properties_equal (TextProperty* prop, GdkFont* font, GdkColor *fore, GdkCol
 
   if (prop->flags & PROPERTY_BACKGROUND)
     {
-      if (!back || !gdk_color_equal (&prop->fore_color, fore))
+      if (!back || !gdk_color_equal (&prop->back_color, back))
        return FALSE;
     }
   else
-    if (fore != NULL)
+    if (back != NULL)
       return FALSE;
   
   return TRUE;