Reset priv->changing before returning. (#100443)

	* gtk/gtkcolorsel.c (gtk_color_selection_set_previous_color):
	(gtk_color_selection_set_previous_alpha): Reset priv->changing
	before returning.  (#100443)

diff --git a/ChangeLog b/ChangeLog
index 37201097f54896c646ffad8051a553e32025123e..352536d0b3d9dc51d18ee11e90b35ce4bdf5d4ef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-12-08  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcolorsel.c (gtk_color_selection_set_previous_color): 
+       (gtk_color_selection_set_previous_alpha): Reset priv->changing 
+       before returning.  (#100443)
+
 Sat Dec  7 14:45:50 GMT 2002  Tony Gale <gale@gtk.org>
 
        * docs/tutorial/gtk-tut.sgml: minor fixes

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 37201097f54896c646ffad8051a553e32025123e..352536d0b3d9dc51d18ee11e90b35ce4bdf5d4ef 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2002-12-08  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcolorsel.c (gtk_color_selection_set_previous_color): 
+       (gtk_color_selection_set_previous_alpha): Reset priv->changing 
+       before returning.  (#100443)
+
 Sat Dec  7 14:45:50 GMT 2002  Tony Gale <gale@gtk.org>
 
        * docs/tutorial/gtk-tut.sgml: minor fixes

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 37201097f54896c646ffad8051a553e32025123e..352536d0b3d9dc51d18ee11e90b35ce4bdf5d4ef 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+2002-12-08  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcolorsel.c (gtk_color_selection_set_previous_color): 
+       (gtk_color_selection_set_previous_alpha): Reset priv->changing 
+       before returning.  (#100443)
+
 Sat Dec  7 14:45:50 GMT 2002  Tony Gale <gale@gtk.org>
 
        * docs/tutorial/gtk-tut.sgml: minor fixes

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 37201097f54896c646ffad8051a553e32025123e..352536d0b3d9dc51d18ee11e90b35ce4bdf5d4ef 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2002-12-08  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcolorsel.c (gtk_color_selection_set_previous_color): 
+       (gtk_color_selection_set_previous_alpha): Reset priv->changing 
+       before returning.  (#100443)
+
 Sat Dec  7 14:45:50 GMT 2002  Tony Gale <gale@gtk.org>
 
        * docs/tutorial/gtk-tut.sgml: minor fixes

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 37201097f54896c646ffad8051a553e32025123e..352536d0b3d9dc51d18ee11e90b35ce4bdf5d4ef 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2002-12-08  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcolorsel.c (gtk_color_selection_set_previous_color): 
+       (gtk_color_selection_set_previous_alpha): Reset priv->changing 
+       before returning.  (#100443)
+
 Sat Dec  7 14:45:50 GMT 2002  Tony Gale <gale@gtk.org>
 
        * docs/tutorial/gtk-tut.sgml: minor fixes

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 37201097f54896c646ffad8051a553e32025123e..352536d0b3d9dc51d18ee11e90b35ce4bdf5d4ef 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2002-12-08  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcolorsel.c (gtk_color_selection_set_previous_color): 
+       (gtk_color_selection_set_previous_alpha): Reset priv->changing 
+       before returning.  (#100443)
+
 Sat Dec  7 14:45:50 GMT 2002  Tony Gale <gale@gtk.org>
 
        * docs/tutorial/gtk-tut.sgml: minor fixes

diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c
index 6588ece9c499d1ad8de8884f8aa76fb9fceb21ca..7d6a7236966ae271fe4af16c152557dc6c0ad534 100644 (file)
--- a/gtk/gtkcolorsel.c
+++ b/gtk/gtkcolorsel.c
@@ -2357,6 +2357,7 @@ gtk_color_selection_set_previous_color (GtkColorSelection *colorsel,
                  &priv->old_color[COLORSEL_VALUE]);
   color_sample_draw_samples (colorsel);
   priv->default_set = TRUE;
+  priv->changing = FALSE;
 }
 
 /**
@@ -2380,6 +2381,7 @@ gtk_color_selection_set_previous_alpha (GtkColorSelection *colorsel,
   priv->old_color[COLORSEL_OPACITY] = SCALE (alpha);
   color_sample_draw_samples (colorsel);
   priv->default_alpha_set = TRUE;
+  priv->changing = FALSE;
 }