diff --git a/capplets/file-types/ChangeLog b/capplets/file-types/ChangeLog
index e45d5d6c1..5b8a080a0 100644
--- a/capplets/file-types/ChangeLog
+++ b/capplets/file-types/ChangeLog
@@ -1,3 +1,9 @@
+2002-05-31  Jody Goldberg <jody@gnome.org>
+
+	http://bugzilla.gnome.org/show_bug.cgi?id=83545
+	* mime-types-model.c (mime_types_model_iter_parent) : Use the child
+	  not the result.
+
 2002-05-29  Jody Goldberg <jody@gnome.org>
 
 	* mime-type-info.c (get_category_description) : put things in Misc if
diff --git a/capplets/file-types/mime-types-model.c b/capplets/file-types/mime-types-model.c
index df7cf6216..d788699af 100644
--- a/capplets/file-types/mime-types-model.c
+++ b/capplets/file-types/mime-types-model.c
@@ -95,7 +95,7 @@ static gboolean     mime_types_model_iter_nth_child  (GtkTreeModel      *tree_mo
 						      GtkTreeIter       *parent,
 						      gint               n);
 static gboolean     mime_types_model_iter_parent     (GtkTreeModel      *tree_model,
-						      GtkTreeIter       *iter,
+						      GtkTreeIter       *result,
 						      GtkTreeIter       *child);
 
 
@@ -603,7 +603,7 @@ mime_types_model_iter_nth_child (GtkTreeModel *tree_model, GtkTreeIter *iter, Gt
 }
 
 static gboolean
-mime_types_model_iter_parent (GtkTreeModel *tree_model, GtkTreeIter *iter, GtkTreeIter *child)
+mime_types_model_iter_parent (GtkTreeModel *tree_model, GtkTreeIter *result, GtkTreeIter *child)
 {
 	MimeTypesModel *model;
 	ModelEntry *entry;
@@ -612,13 +612,13 @@ mime_types_model_iter_parent (GtkTreeModel *tree_model, GtkTreeIter *iter, GtkTr
 	g_return_val_if_fail (IS_MIME_TYPES_MODEL (tree_model), FALSE);
 
 	model = MIME_TYPES_MODEL (tree_model);
-	entry = iter->user_data;
+	entry = child->user_data;
 
 	if (entry != NULL && entry->parent->type != MODEL_ENTRY_NONE)
-		iter->user_data = entry->parent;
+		result->user_data = entry->parent;
 	else
-		iter->user_data = NULL;
+		result->user_data = NULL;
 
-	return iter->user_data != NULL;
+	return result->user_data != NULL;
 }