diff --git a/ChangeLog b/ChangeLog index 2412a6c9ef..dff5709fdb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2005-04-05 Matthias Clasen + * gtk/gtktreemodelsort.c (gtk_tree_model_sort_build_level): + Fix a typo in a warning. + * gtk/gtkaboutdialog.c (gtk_about_dialog_init): Protect the license and credits buttons from being affected by gtk_widget_show_all(). (#172724) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2412a6c9ef..dff5709fdb 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2005-04-05 Matthias Clasen + * gtk/gtktreemodelsort.c (gtk_tree_model_sort_build_level): + Fix a typo in a warning. + * gtk/gtkaboutdialog.c (gtk_about_dialog_init): Protect the license and credits buttons from being affected by gtk_widget_show_all(). (#172724) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 2412a6c9ef..dff5709fdb 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,8 @@ 2005-04-05 Matthias Clasen + * gtk/gtktreemodelsort.c (gtk_tree_model_sort_build_level): + Fix a typo in a warning. + * gtk/gtkaboutdialog.c (gtk_about_dialog_init): Protect the license and credits buttons from being affected by gtk_widget_show_all(). (#172724) diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c index dfc9e3e7ed..b14738ca61 100644 --- a/gtk/gtktreemodelsort.c +++ b/gtk/gtktreemodelsort.c @@ -2314,7 +2314,7 @@ gtk_tree_model_sort_build_level (GtkTreeModelSort *tree_model_sort, if (gtk_tree_model_iter_next (tree_model_sort->child_model, &iter) == FALSE && i < length - 1) { - g_warning ("There is a discrepency between the sort model and the child model."); + g_warning ("There is a discrepancy between the sort model and the child model."); return; } }