[nautilus-actions] Finalize merge with master branch

[Pierre Wieser <pwieser src gnome org>]

commit f9fe7ce7ce99a68f19bb546c85d18417b9f55fb5
Author: Pierre Wieser <pwieser trychlos org>
Date:   Thu May 20 18:51:19 2010 +0200

    Finalize merge with master branch

 ChangeLog                    |    5 +++++
 src/io-desktop/nadp-reader.c |   23 -----------------------
 2 files changed, 5 insertions(+), 23 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 9aced24..c0075b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,11 @@
 
 	* src/core/na-iabout.c: Update copyright notice.
 
+2010-05-20 Pierre Wieser <pwieser trychlos org>
+
+	* src/io-desktop/nadp-reader.c
+	(nadp_reader_ifactory_provider_read_start): Removed function.
+
 2010-05-17 Pierre Wieser <pwieser trychlos org>
 
 	* configure.ac: Fix typo.
diff --git a/src/io-desktop/nadp-reader.c b/src/io-desktop/nadp-reader.c
index 2760d0f..237079d 100644
--- a/src/io-desktop/nadp-reader.c
+++ b/src/io-desktop/nadp-reader.c
@@ -323,29 +323,6 @@ free_desktop_paths( GList *paths )
 }
 
 /*
- * called before starting with reading an object
- */
-void
-nadp_reader_ifactory_provider_read_start( const NAIFactoryProvider *reader, void *reader_data, const NAIFactoryObject *serializable, GSList **messages )
-{
-	static const gchar *thisfn = "nadp_reader_ifactory_provider_read_start";
-
-	g_debug( "%s: reader=%p (%s), reader_data=%p, serializable=%p (%s), messages=%p",
-			thisfn,
-			( void * ) reader, G_OBJECT_TYPE_NAME( reader ),
-			( void * ) reader_data,
-			( void * ) serializable, G_OBJECT_TYPE_NAME( serializable ),
-			( void * ) messages );
-
-	g_return_if_fail( NA_IS_IFACTORY_PROVIDER( reader ));
-	g_return_if_fail( NADP_IS_DESKTOP_PROVIDER( reader ));
-	g_return_if_fail( NA_IS_IFACTORY_OBJECT( serializable ));
-
-	if( !NADP_DESKTOP_PROVIDER( reader )->private->dispose_has_run ){
-	}
-}
-
-/*
  * reading any data from a desktop file requires:
  * - a NadpDesktopFile object which has been initialized with the .desktop file
  *   -> has been attached to the NAObjectItem in get_item() above