diff --git a/ChangeLog b/ChangeLog index 37201097f5..352536d0b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-12-08 Matthias Clasen + + * 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 * docs/tutorial/gtk-tut.sgml: minor fixes diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 37201097f5..352536d0b3 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2002-12-08 Matthias Clasen + + * 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 * docs/tutorial/gtk-tut.sgml: minor fixes diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 37201097f5..352536d0b3 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +2002-12-08 Matthias Clasen + + * 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 * docs/tutorial/gtk-tut.sgml: minor fixes diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 37201097f5..352536d0b3 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +2002-12-08 Matthias Clasen + + * 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 * docs/tutorial/gtk-tut.sgml: minor fixes diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 37201097f5..352536d0b3 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2002-12-08 Matthias Clasen + + * 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 * docs/tutorial/gtk-tut.sgml: minor fixes diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 37201097f5..352536d0b3 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2002-12-08 Matthias Clasen + + * 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 * docs/tutorial/gtk-tut.sgml: minor fixes diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c index 6588ece9c4..7d6a723696 100644 --- 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; }