diff --git a/ChangeLog b/ChangeLog index cedc12764f..f5cc9e7840 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2002-02-20 Sven Neumann + + * gtk/gtkcolorsel.c (gtk_color_selection_finalize): check + handler_id before disconnecting the signal handler since it might + have never been connected if the GtkColorSelection is destroyed + before it was realized. + 2002-02-20 Matthias Clasen * docs/tutorial/gtk-tut.sgml: Fold back Svens g_signal fixes from diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index cedc12764f..f5cc9e7840 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,10 @@ +2002-02-20 Sven Neumann + + * gtk/gtkcolorsel.c (gtk_color_selection_finalize): check + handler_id before disconnecting the signal handler since it might + have never been connected if the GtkColorSelection is destroyed + before it was realized. + 2002-02-20 Matthias Clasen * docs/tutorial/gtk-tut.sgml: Fold back Svens g_signal fixes from diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index cedc12764f..f5cc9e7840 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2002-02-20 Sven Neumann + + * gtk/gtkcolorsel.c (gtk_color_selection_finalize): check + handler_id before disconnecting the signal handler since it might + have never been connected if the GtkColorSelection is destroyed + before it was realized. + 2002-02-20 Matthias Clasen * docs/tutorial/gtk-tut.sgml: Fold back Svens g_signal fixes from diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index cedc12764f..f5cc9e7840 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +2002-02-20 Sven Neumann + + * gtk/gtkcolorsel.c (gtk_color_selection_finalize): check + handler_id before disconnecting the signal handler since it might + have never been connected if the GtkColorSelection is destroyed + before it was realized. + 2002-02-20 Matthias Clasen * docs/tutorial/gtk-tut.sgml: Fold back Svens g_signal fixes from diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index cedc12764f..f5cc9e7840 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +2002-02-20 Sven Neumann + + * gtk/gtkcolorsel.c (gtk_color_selection_finalize): check + handler_id before disconnecting the signal handler since it might + have never been connected if the GtkColorSelection is destroyed + before it was realized. + 2002-02-20 Matthias Clasen * docs/tutorial/gtk-tut.sgml: Fold back Svens g_signal fixes from diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index cedc12764f..f5cc9e7840 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +2002-02-20 Sven Neumann + + * gtk/gtkcolorsel.c (gtk_color_selection_finalize): check + handler_id before disconnecting the signal handler since it might + have never been connected if the GtkColorSelection is destroyed + before it was realized. + 2002-02-20 Matthias Clasen * docs/tutorial/gtk-tut.sgml: Fold back Svens g_signal fixes from diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index cedc12764f..f5cc9e7840 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +2002-02-20 Sven Neumann + + * gtk/gtkcolorsel.c (gtk_color_selection_finalize): check + handler_id before disconnecting the signal handler since it might + have never been connected if the GtkColorSelection is destroyed + before it was realized. + 2002-02-20 Matthias Clasen * docs/tutorial/gtk-tut.sgml: Fold back Svens g_signal fixes from diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c index 5c9791863a..0a7f2d9f2e 100644 --- a/gtk/gtkcolorsel.c +++ b/gtk/gtkcolorsel.c @@ -1944,8 +1944,9 @@ gtk_color_selection_finalize (GObject *object) priv = cselection->private_data; - g_signal_handler_disconnect (gtk_settings_get_default (), - priv->settings_connection); + if (priv->settings_connection) + g_signal_handler_disconnect (gtk_settings_get_default (), + priv->settings_connection); g_free (cselection->private_data); cselection->private_data = NULL;