From bfb64fa04f98fc9f7eb5f4da39ab409934f1afd2 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 21 Oct 2004 02:51:50 +0000 Subject: [PATCH] Make the code clearer. (#155239, Murray Cumming) 2004-10-20 Matthias Clasen * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_new): Make the code clearer. (#155239, Murray Cumming) --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ ChangeLog.pre-2-6 | 3 +++ ChangeLog.pre-2-8 | 3 +++ gtk/gtktreemodelfilter.c | 9 ++++----- 5 files changed, 16 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2b1b4712db..2ebf9fe288 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2004-10-20 Matthias Clasen + * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_new): Make + the code clearer. (#155239, Murray Cumming) + * gtk/gtkicontheme.c: Small fixes. * gtk/gtkrc.c: Include gtkmodules.h. (#155885, Kazuki IWAMOTO) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2b1b4712db..2ebf9fe288 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2004-10-20 Matthias Clasen + * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_new): Make + the code clearer. (#155239, Murray Cumming) + * gtk/gtkicontheme.c: Small fixes. * gtk/gtkrc.c: Include gtkmodules.h. (#155885, Kazuki IWAMOTO) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 2b1b4712db..2ebf9fe288 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,8 @@ 2004-10-20 Matthias Clasen + * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_new): Make + the code clearer. (#155239, Murray Cumming) + * gtk/gtkicontheme.c: Small fixes. * gtk/gtkrc.c: Include gtkmodules.h. (#155885, Kazuki IWAMOTO) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 2b1b4712db..2ebf9fe288 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,8 @@ 2004-10-20 Matthias Clasen + * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_new): Make + the code clearer. (#155239, Murray Cumming) + * gtk/gtkicontheme.c: Small fixes. * gtk/gtkrc.c: Include gtkmodules.h. (#155885, Kazuki IWAMOTO) diff --git a/gtk/gtktreemodelfilter.c b/gtk/gtktreemodelfilter.c index 6d83fb1609..122afa10f0 100644 --- a/gtk/gtktreemodelfilter.c +++ b/gtk/gtktreemodelfilter.c @@ -2417,11 +2417,10 @@ gtk_tree_model_filter_new (GtkTreeModel *child_model, g_return_val_if_fail (GTK_IS_TREE_MODEL (child_model), NULL); - retval = GTK_TREE_MODEL (g_object_new (gtk_tree_model_filter_get_type (), NULL)); - - gtk_tree_model_filter_set_model (GTK_TREE_MODEL_FILTER (retval), - child_model); - gtk_tree_model_filter_set_root (GTK_TREE_MODEL_FILTER (retval), root); + retval = GTK_TREE_MODEL (g_object_new (GTK_TYPE_TREE_MODEL_FILTER, + "child_model", child_model, + "virtual_root", root, + NULL)); return retval; }