From 997980a122402ac12fc09c46011055a28deab7d9 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 22 Sep 2004 20:26:34 +0000 Subject: [PATCH] Don't leak old_text. (#153467, Christian Persch) 2004-09-22 Matthias Clasen * gtk/gtktreeview.c (gtk_tree_view_key_press): Don't leak old_text. (#153467, Christian Persch) --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ ChangeLog.pre-2-6 | 3 +++ ChangeLog.pre-2-8 | 3 +++ gtk/gtktreeview.c | 6 ++++-- 5 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 423893f95e..02fb2a7ca6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2004-09-22 Matthias Clasen + * gtk/gtktreeview.c (gtk_tree_view_key_press): Don't leak old_text. + (#153467, Christian Persch) + * gtk/gtkfilechooserdefault.c (selection_check_foreach_cb): Don't use bitops on booleans. (gtk_file_chooser_default_should_respond): Make it easier to diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 423893f95e..02fb2a7ca6 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2004-09-22 Matthias Clasen + * gtk/gtktreeview.c (gtk_tree_view_key_press): Don't leak old_text. + (#153467, Christian Persch) + * gtk/gtkfilechooserdefault.c (selection_check_foreach_cb): Don't use bitops on booleans. (gtk_file_chooser_default_should_respond): Make it easier to diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 423893f95e..02fb2a7ca6 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,8 @@ 2004-09-22 Matthias Clasen + * gtk/gtktreeview.c (gtk_tree_view_key_press): Don't leak old_text. + (#153467, Christian Persch) + * gtk/gtkfilechooserdefault.c (selection_check_foreach_cb): Don't use bitops on booleans. (gtk_file_chooser_default_should_respond): Make it easier to diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 423893f95e..02fb2a7ca6 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,8 @@ 2004-09-22 Matthias Clasen + * gtk/gtktreeview.c (gtk_tree_view_key_press): Don't leak old_text. + (#153467, Christian Persch) + * gtk/gtkfilechooserdefault.c (selection_check_foreach_cb): Don't use bitops on booleans. (gtk_file_chooser_default_should_respond): Make it easier to diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index cabda22907..5220cf110b 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -4336,6 +4336,7 @@ gtk_tree_view_key_press (GtkWidget *widget, const char *new_text; gboolean retval; GdkScreen *screen; + gboolean text_modified; gtk_tree_view_ensure_interactive_directory (tree_view); @@ -4362,10 +4363,11 @@ gtk_tree_view_key_press (GtkWidget *widget, * the text has changed. */ new_text = gtk_entry_get_text (GTK_ENTRY (tree_view->priv->search_entry)); + text_modified = strcmp (old_text, new_text) != 0; + g_free (old_text); if (tree_view->priv->imcontext_changed || /* we're in a preedit */ - (retval && strcmp (old_text, new_text))) /* ...or the text was modified */ + (retval && text_modified)) /* ...or the text was modified */ { - g_free (old_text); if (gtk_tree_view_real_start_interactive_search (tree_view, FALSE)) { gtk_widget_grab_focus (GTK_WIDGET (tree_view));