From 17ac5f4dfbc18414a000de02ba51d212d56d9873 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 16 Jun 2008 09:16:25 +0000 Subject: [PATCH] Remove check for dispose implementation as it annoys Emmanuele. 2008-06-16 Ross Burton * gio/gfileenumerator.c: Remove check for dispose implementation as it annoys Emmanuele. svn path=/trunk/; revision=7045 --- ChangeLog | 5 +++++ gio/gfileenumerator.c | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 529441928..73b235643 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-06-16 Ross Burton + + * gio/gfileenumerator.c: + Remove check for dispose implementation as it annoys Emmanuele. + 2008-06-16 Ross Burton Bug 536252 – GFileEnumerator should allow access to the containing diff --git a/gio/gfileenumerator.c b/gio/gfileenumerator.c index e03edd522..8011a1270 100644 --- a/gio/gfileenumerator.c +++ b/gio/gfileenumerator.c @@ -118,8 +118,7 @@ g_file_enumerator_dispose (GObject *object) enumerator->priv->container = NULL; } - if (G_OBJECT_CLASS (g_file_enumerator_parent_class)->dispose) - (*G_OBJECT_CLASS (g_file_enumerator_parent_class)->dispose) (object); + (*G_OBJECT_CLASS (g_file_enumerator_parent_class)->dispose) (object); } static void