diff --git a/ChangeLog b/ChangeLog index 254464bd54..7e8ed883d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2005-06-08 Matthias Clasen + * gtk/gtktreemodel.c (gtk_tree_path_new_from_string): Check for + negative before appending the index, to avoid double error + message. (#306393, Morten Welinder) + * gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search): Don't crash if search_window is NULL. (#304914, Victor Osadci, testcase by Olaf Vitters) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 254464bd54..7e8ed883d3 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,9 @@ 2005-06-08 Matthias Clasen + * gtk/gtktreemodel.c (gtk_tree_path_new_from_string): Check for + negative before appending the index, to avoid double error + message. (#306393, Morten Welinder) + * gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search): Don't crash if search_window is NULL. (#304914, Victor Osadci, testcase by Olaf Vitters) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 254464bd54..7e8ed883d3 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,9 @@ 2005-06-08 Matthias Clasen + * gtk/gtktreemodel.c (gtk_tree_path_new_from_string): Check for + negative before appending the index, to avoid double error + message. (#306393, Morten Welinder) + * gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search): Don't crash if search_window is NULL. (#304914, Victor Osadci, testcase by Olaf Vitters) diff --git a/gtk/gtktreemodel.c b/gtk/gtktreemodel.c index f33b3396fc..0c034e526a 100644 --- a/gtk/gtktreemodel.c +++ b/gtk/gtktreemodel.c @@ -362,7 +362,6 @@ gtk_tree_path_new_from_string (const gchar *path) while (1) { i = strtol (path, &ptr, 10); - gtk_tree_path_append_index (retval, i); if (i < 0) { @@ -370,6 +369,9 @@ gtk_tree_path_new_from_string (const gchar *path) gtk_tree_path_free (retval); return NULL; } + + gtk_tree_path_append_index (retval, i); + if (*ptr == '\000') break; if (ptr == path || *ptr != ':')