diff --git a/ChangeLog b/ChangeLog index db0ad27b38..2bc45dcdf6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 2004-10-04 Matthias Clasen - * gtk/gtkwindow.c (gtk_window_set_icon_list): Ref the new icons + * gtk/gtkwindow.c (gtk_window_set_icon_list): + (gtk_window_set_default_icon_list): Ref the new icons before unreffing the old ones. (#154468, Morten Welinder) 2004-10-03 Matthias Clasen diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index db0ad27b38..2bc45dcdf6 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,6 +1,7 @@ 2004-10-04 Matthias Clasen - * gtk/gtkwindow.c (gtk_window_set_icon_list): Ref the new icons + * gtk/gtkwindow.c (gtk_window_set_icon_list): + (gtk_window_set_default_icon_list): Ref the new icons before unreffing the old ones. (#154468, Morten Welinder) 2004-10-03 Matthias Clasen diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index db0ad27b38..2bc45dcdf6 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,6 +1,7 @@ 2004-10-04 Matthias Clasen - * gtk/gtkwindow.c (gtk_window_set_icon_list): Ref the new icons + * gtk/gtkwindow.c (gtk_window_set_icon_list): + (gtk_window_set_default_icon_list): Ref the new icons before unreffing the old ones. (#154468, Morten Welinder) 2004-10-03 Matthias Clasen diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index db0ad27b38..2bc45dcdf6 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,6 +1,7 @@ 2004-10-04 Matthias Clasen - * gtk/gtkwindow.c (gtk_window_set_icon_list): Ref the new icons + * gtk/gtkwindow.c (gtk_window_set_icon_list): + (gtk_window_set_default_icon_list): Ref the new icons before unreffing the old ones. (#154468, Morten Welinder) 2004-10-03 Matthias Clasen diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 2066357034..b61efceb9d 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -3125,14 +3125,15 @@ gtk_window_set_default_icon_list (GList *list) */ default_icon_serial++; + g_list_foreach (list, + (GFunc) g_object_ref, NULL); + g_list_foreach (default_icon_list, (GFunc) g_object_unref, NULL); g_list_free (default_icon_list); default_icon_list = g_list_copy (list); - g_list_foreach (default_icon_list, - (GFunc) g_object_ref, NULL); /* Update all toplevels */ toplevels = gtk_window_list_toplevels ();