From fed2321c9a4ce5c41220b99c56c16f6cd4d66037 Mon Sep 17 00:00:00 2001 From: Jody Goldberg Date: Mon, 30 Dec 2002 18:25:17 +0000 Subject: [PATCH] http://bugzilla.gnome.org/show_bug.cgi?id=101128 apply patch from padraig. 2002-12-30 Jody Goldberg http://bugzilla.gnome.org/show_bug.cgi?id=101128 * mime-types-model.c (mime_types_model_iter_children) : apply patch from padraig. --- capplets/file-types/ChangeLog | 6 ++++++ capplets/file-types/mime-types-model.c | 7 ++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/capplets/file-types/ChangeLog b/capplets/file-types/ChangeLog index adead2a8f..2519953e0 100644 --- a/capplets/file-types/ChangeLog +++ b/capplets/file-types/ChangeLog @@ -1,3 +1,9 @@ +2002-12-30 Jody Goldberg + + http://bugzilla.gnome.org/show_bug.cgi?id=101128 + * mime-types-model.c (mime_types_model_iter_children) : apply patch + from padraig. + 2002-12-18 Jody Goldberg * Release 2.1.5 diff --git a/capplets/file-types/mime-types-model.c b/capplets/file-types/mime-types-model.c index 6ab13de57..493062883 100644 --- a/capplets/file-types/mime-types-model.c +++ b/capplets/file-types/mime-types-model.c @@ -506,12 +506,9 @@ mime_types_model_iter_children (GtkTreeModel *tree_model, GtkTreeIter *iter, Gtk if (parent != NULL) entry = parent->user_data; else - entry = NULL; + entry = get_model_entries (tree_model); - if (entry == NULL) - iter->user_data = get_model_entries (tree_model); - else - iter->user_data = entry->first_child; + iter->user_data = entry->first_child; if (model->p->category_only) while (iter->user_data != NULL && !IS_CATEGORY (MODEL_ENTRY (iter->user_data)))