From 30d9f88996c6cf5148837063ea45cef3f17c96da Mon Sep 17 00:00:00 2001 From: Kristian Rietveld Date: Fri, 19 Dec 2003 21:21:12 +0000 Subject: [PATCH] use strstr instead of strcmp (#117127, suggestion from Soeren Sandmann). Fri Dec 19 22:18:19 2003 Kristian Rietveld * gtk/gtktreeview.c (gtk_tree_view_search_equal_func): use strstr instead of strcmp (#117127, suggestion from Soeren Sandmann). --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtktreeview.c | 2 +- 6 files changed, 26 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e03e3c25d5..5e701375dc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Dec 19 22:18:19 2003 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_search_equal_func): use strstr + instead of strcmp (#117127, suggestion from Soeren Sandmann). + Fri Dec 19 21:52:46 2003 Kristian Rietveld * gtk/gtkmenu.c (gtk_menu_do_insert): move item insertion logic diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index e03e3c25d5..5e701375dc 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Fri Dec 19 22:18:19 2003 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_search_equal_func): use strstr + instead of strcmp (#117127, suggestion from Soeren Sandmann). + Fri Dec 19 21:52:46 2003 Kristian Rietveld * gtk/gtkmenu.c (gtk_menu_do_insert): move item insertion logic diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index e03e3c25d5..5e701375dc 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Fri Dec 19 22:18:19 2003 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_search_equal_func): use strstr + instead of strcmp (#117127, suggestion from Soeren Sandmann). + Fri Dec 19 21:52:46 2003 Kristian Rietveld * gtk/gtkmenu.c (gtk_menu_do_insert): move item insertion logic diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index e03e3c25d5..5e701375dc 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Fri Dec 19 22:18:19 2003 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_search_equal_func): use strstr + instead of strcmp (#117127, suggestion from Soeren Sandmann). + Fri Dec 19 21:52:46 2003 Kristian Rietveld * gtk/gtkmenu.c (gtk_menu_do_insert): move item insertion logic diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index e03e3c25d5..5e701375dc 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Fri Dec 19 22:18:19 2003 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_search_equal_func): use strstr + instead of strcmp (#117127, suggestion from Soeren Sandmann). + Fri Dec 19 21:52:46 2003 Kristian Rietveld * gtk/gtkmenu.c (gtk_menu_do_insert): move item insertion logic diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 59c3ff9a6a..4222153b04 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -11663,7 +11663,7 @@ gtk_tree_view_search_equal_func (GtkTreeModel *model, key_len = strlen (case_normalized_key); - if (!strncmp (case_normalized_key, case_normalized_string, key_len)) + if (strstr (case_normalized_string, case_normalized_key)) retval = FALSE; } else