Remove check for dispose implementation as it annoys Emmanuele.

2008-06-16  Ross Burton  <ross@burtonini.com>

	* gio/gfileenumerator.c:
	Remove check for dispose implementation as it annoys Emmanuele.

svn path=/trunk/; revision=7045

diff --git a/ChangeLog b/ChangeLog
index 52944192803c8214d33a92bb22e6adf05151eff1..73b235643a8b930735737c5dc2b33eaf85e651c5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-16  Ross Burton  <ross@burtonini.com>
+
+       * gio/gfileenumerator.c:
+       Remove check for dispose implementation as it annoys Emmanuele.
+       
 2008-06-16  Ross Burton  <ross@burtonini.com>
 
        Bug 536252 – GFileEnumerator should allow access to the containing

diff --git a/gio/gfileenumerator.c b/gio/gfileenumerator.c
index e03edd522af0759291d9527902ed34ee8a49a205..8011a1270c47dee18621e2a364aab51328ea46b1 100644 (file)
--- 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