diff --git a/ChangeLog b/ChangeLog index cb9eea4523..d82cb43bf2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Tue Feb 26 17:04:44 2002 Owen Taylor + + * gtk/gtkcolorsel.c (update_color): Emit ::color_changed + every time we notify current_color. (Brute force + fix for #72470, Matthias Clasen). Some fixes to improve + reentrancy. + Tue Feb 26 15:04:33 2002 Owen Taylor * gtk/gtkentry.c (gtk_entry_enter_text): use diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index cb9eea4523..d82cb43bf2 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,10 @@ +Tue Feb 26 17:04:44 2002 Owen Taylor + + * gtk/gtkcolorsel.c (update_color): Emit ::color_changed + every time we notify current_color. (Brute force + fix for #72470, Matthias Clasen). Some fixes to improve + reentrancy. + Tue Feb 26 15:04:33 2002 Owen Taylor * gtk/gtkentry.c (gtk_entry_enter_text): use diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index cb9eea4523..d82cb43bf2 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Tue Feb 26 17:04:44 2002 Owen Taylor + + * gtk/gtkcolorsel.c (update_color): Emit ::color_changed + every time we notify current_color. (Brute force + fix for #72470, Matthias Clasen). Some fixes to improve + reentrancy. + Tue Feb 26 15:04:33 2002 Owen Taylor * gtk/gtkentry.c (gtk_entry_enter_text): use diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index cb9eea4523..d82cb43bf2 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +Tue Feb 26 17:04:44 2002 Owen Taylor + + * gtk/gtkcolorsel.c (update_color): Emit ::color_changed + every time we notify current_color. (Brute force + fix for #72470, Matthias Clasen). Some fixes to improve + reentrancy. + Tue Feb 26 15:04:33 2002 Owen Taylor * gtk/gtkentry.c (gtk_entry_enter_text): use diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index cb9eea4523..d82cb43bf2 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Tue Feb 26 17:04:44 2002 Owen Taylor + + * gtk/gtkcolorsel.c (update_color): Emit ::color_changed + every time we notify current_color. (Brute force + fix for #72470, Matthias Clasen). Some fixes to improve + reentrancy. + Tue Feb 26 15:04:33 2002 Owen Taylor * gtk/gtkentry.c (gtk_entry_enter_text): use diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index cb9eea4523..d82cb43bf2 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Tue Feb 26 17:04:44 2002 Owen Taylor + + * gtk/gtkcolorsel.c (update_color): Emit ::color_changed + every time we notify current_color. (Brute force + fix for #72470, Matthias Clasen). Some fixes to improve + reentrancy. + Tue Feb 26 15:04:33 2002 Owen Taylor * gtk/gtkentry.c (gtk_entry_enter_text): use diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index cb9eea4523..d82cb43bf2 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Tue Feb 26 17:04:44 2002 Owen Taylor + + * gtk/gtkcolorsel.c (update_color): Emit ::color_changed + every time we notify current_color. (Brute force + fix for #72470, Matthias Clasen). Some fixes to improve + reentrancy. + Tue Feb 26 15:04:33 2002 Owen Taylor * gtk/gtkentry.c (gtk_entry_enter_text): use diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c index c47164634c..3f78baaf3b 100644 --- a/gtk/gtkcolorsel.c +++ b/gtk/gtkcolorsel.c @@ -1562,10 +1562,16 @@ update_color (GtkColorSelection *colorsel) gtk_entry_set_text (GTK_ENTRY (priv->hex_entry), entryval); priv->changing = FALSE; + g_object_ref (colorsel); + + g_signal_emit (colorsel, color_selection_signals[COLOR_CHANGED], 0); + g_object_freeze_notify (G_OBJECT (colorsel)); g_object_notify (G_OBJECT (colorsel), "current_color"); g_object_notify (G_OBJECT (colorsel), "current_alpha"); g_object_thaw_notify (G_OBJECT (colorsel)); + + g_object_unref (colorsel); } @@ -2177,8 +2183,8 @@ gtk_color_selection_set_current_color (GtkColorSelection *colorsel, for (i = 0; i < COLORSEL_NUM_CHANNELS; i++) priv->old_color[i] = priv->color[i]; } - update_color (colorsel); priv->default_set = TRUE; + update_color (colorsel); } /** @@ -2206,8 +2212,8 @@ gtk_color_selection_set_current_alpha (GtkColorSelection *colorsel, for (i = 0; i < COLORSEL_NUM_CHANNELS; i++) priv->old_color[i] = priv->color[i]; } - update_color (colorsel); priv->default_alpha_set = TRUE; + update_color (colorsel); } /** @@ -2247,9 +2253,9 @@ gtk_color_selection_set_color (GtkColorSelection *colorsel, for (i = 0; i < COLORSEL_NUM_CHANNELS; i++) priv->old_color[i] = priv->color[i]; } - update_color (colorsel); priv->default_set = TRUE; priv->default_alpha_set = TRUE; + update_color (colorsel); } /**