[nautilus-actions] Remove na_pivot_set_automatic_reload() unused function

[Pierre Wieser <pwieser src gnome org>]

commit 231f4dd9b2afda7833280d0cc8f5a2a3dca4d022
Author: Pierre Wieser <pwieser trychlos org>
Date:   Wed Feb 2 22:53:48 2011 +0100

    Remove na_pivot_set_automatic_reload() unused function

 ChangeLog                   |    9 +
 src/core/na-pivot.c         |   47 +----
 src/core/na-pivot.h         |    3 +-
 src/nact/nact-main-window.c |  440 +++++++++++++++++++++++--------------------
 src/test/test-reader.c      |    4 -
 5 files changed, 246 insertions(+), 257 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 3ddb688..43ff2ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2011-02-02 Pierre Wieser <pwieser trychlos org>
 
+	* src/core/na-pivot.c:
+	* src/core/na-pivot.h
+	(na_pivot_set_automatic_reload): Remove unused function.
+
+	* src/test/test-reader.c: Updated accordingly.
+
+	* src/nact/nact-main-window.c (instance_constructed):
+	Connect to PIVOT_SIGNAL_ITEMS_CHANGED signal.
+
 	Rename nact-gtk-utils to base-gtk-utils and merge base-iprefs into it
 
 	* src/nact/base-iprefs.c:
diff --git a/src/core/na-pivot.c b/src/core/na-pivot.c
index 45ecf87..69360f2 100644
--- a/src/core/na-pivot.c
+++ b/src/core/na-pivot.c
@@ -69,13 +69,6 @@ struct _NAPivotPrivate {
 	 */
 	GList      *tree;
 
-	/* whether to automatically reload the whole configuration tree
-	 * when a modification is detected in one of the underlying I/O
-	 * storage subsystems
-	 * defaults to FALSE
-	 */
-	gboolean    automatic_reload;
-
 	/* timeout to manage i/o providers 'item-changed' burst
 	 */
 	NATimeout   change_timeout;
@@ -223,7 +216,6 @@ instance_init( GTypeInstance *instance, gpointer klass )
 	self->private->modules = NULL;
 	self->private->consumers = NULL;
 	self->private->tree = NULL;
-	self->private->automatic_reload = FALSE;
 
 	/* initialize timeout parameters for 'item-changed' handler
 	 */
@@ -416,12 +408,11 @@ na_pivot_dump( const NAPivot *pivot )
 
 	if( !pivot->private->dispose_has_run ){
 
-		g_debug( "%s:     loadable_set=%d", thisfn, pivot->private->loadable_set );
-		g_debug( "%s:          modules=%p (%d elts)", thisfn, ( void * ) pivot->private->modules, g_list_length( pivot->private->modules ));
-		g_debug( "%s:        consumers=%p (%d elts)", thisfn, ( void * ) pivot->private->consumers, g_list_length( pivot->private->consumers ));
-		g_debug( "%s:             tree=%p (%d elts)", thisfn, ( void * ) pivot->private->tree, g_list_length( pivot->private->tree ));
-		g_debug( "%s: automatic_reload=%s", thisfn, pivot->private->automatic_reload ? "True":"False" );
-		/*g_debug( "%s:         monitors=%p (%d elts)", thisfn, ( void * ) pivot->private->monitors, g_list_length( pivot->private->monitors ));*/
+		g_debug( "%s: loadable_set=%d", thisfn, pivot->private->loadable_set );
+		g_debug( "%s:      modules=%p (%d elts)", thisfn, ( void * ) pivot->private->modules, g_list_length( pivot->private->modules ));
+		g_debug( "%s:    consumers=%p (%d elts)", thisfn, ( void * ) pivot->private->consumers, g_list_length( pivot->private->consumers ));
+		g_debug( "%s:         tree=%p (%d elts)", thisfn, ( void * ) pivot->private->tree, g_list_length( pivot->private->tree ));
+		/*g_debug( "%s:     monitors=%p (%d elts)", thisfn, ( void * ) pivot->private->monitors, g_list_length( pivot->private->monitors ));*/
 
 		for( it = pivot->private->tree, i = 0 ; it ; it = it->next ){
 			g_debug( "%s:     [%d]: %p", thisfn, i++, it->data );
@@ -663,9 +654,6 @@ on_items_changed_timeout( NAPivot *pivot )
 
 	/* this has to be deprecated.. or not ?? */
 	g_debug( "%s: triggering NAIPivotConsumer interfaces", thisfn );
-	if( pivot->private->automatic_reload ){
-		na_pivot_load_items( pivot );
-	}
 	for( ic = pivot->private->consumers ; ic ; ic = ic->next ){
 		na_ipivot_consumer_notify_of_items_changed( NA_IPIVOT_CONSUMER( ic->data ));
 	}
@@ -731,31 +719,6 @@ na_pivot_get_settings( const NAPivot *pivot )
 }
 
 /*
- * na_pivot_set_automatic_reload:
- * @pivot: this #NAPivot instance.
- * @reload: whether this #NAPivot instance should automatically reload
- * its list of actions when I/O providers advertise it of a
- * modification.
- *
- * Sets the automatic reload flag.
- *
- * Note that even if the #NAPivot instance is not authorized to
- * automatically reload its list of actions when it is advertised of
- * a modification by one of the I/O providers, it always sends an
- * ad-hoc notification to its consumers.
- */
-void
-na_pivot_set_automatic_reload( NAPivot *pivot, gboolean reload )
-{
-	g_return_if_fail( NA_IS_PIVOT( pivot ));
-
-	if( !pivot->private->dispose_has_run ){
-
-		pivot->private->automatic_reload = reload;
-	}
-}
-
-/*
  * na_pivot_set_loadable:
  * @pivot: this #NAPivot instance.
  * @loadable: the population of items to be loaded.
diff --git a/src/core/na-pivot.h b/src/core/na-pivot.h
index 3f356f7..dc3665b 100644
--- a/src/core/na-pivot.h
+++ b/src/core/na-pivot.h
@@ -166,8 +166,7 @@ NASettings   *na_pivot_get_settings     ( const NAPivot *pivot );
 
 /* NAPivot properties and configuration
  */
-void          na_pivot_set_automatic_reload            ( NAPivot *pivot, gboolean reload );
-void          na_pivot_set_loadable                    ( NAPivot *pivot, guint loadable );
+void          na_pivot_set_loadable     ( NAPivot *pivot, guint loadable );
 
 G_END_DECLS
 
diff --git a/src/nact/nact-main-window.c b/src/nact/nact-main-window.c
index 31d6ff4..5c05b61 100644
--- a/src/nact/nact-main-window.c
+++ b/src/nact/nact-main-window.c
@@ -73,6 +73,8 @@ struct _NactMainWindowClassPrivate {
 struct _NactMainWindowPrivate {
 	gboolean         dispose_has_run;
 
+	NAUpdater       *updater;
+
 	/* TODO: this will have to be replaced with undo-manager */
 	GList           *deleted;
 
@@ -161,6 +163,7 @@ static void     ipivot_consumer_iface_init( NAIPivotConsumerInterface *iface );
 static void     instance_init( GTypeInstance *instance, gpointer klass );
 static void     instance_get_property( GObject *object, guint property_id, GValue *value, GParamSpec *spec );
 static void     instance_set_property( GObject *object, guint property_id, const GValue *value, GParamSpec *spec );
+static void     instance_constructed( GObject *application );
 static void     instance_dispose( GObject *application );
 static void     instance_finalize( GObject *application );
 
@@ -168,9 +171,15 @@ static void     on_base_initialize_gtk_toplevel( NactMainWindow *window, GtkWind
 static void     on_base_initialize_base_window( NactMainWindow *window, gpointer user_data );
 static void     on_base_all_widgets_showed( NactMainWindow *window, gpointer user_data );
 
-static gboolean actually_delete_item( NactMainWindow *window, NAObject *item, NAUpdater *updater, GList **not_deleted, GSList **messages );
+static void     on_pivot_items_changed( NAUpdater *updater, NactMainWindow *window );
+static gboolean confirm_for_giveup_from_pivot( const NactMainWindow *window );
+static gboolean confirm_for_giveup_from_menu( const NactMainWindow *window );
+static void     reload_items( NactMainWindow *window );
 
 static gboolean base_is_willing_to_quit( const BaseWindow *window );
+static gboolean on_delete_event( GtkWidget *toplevel, GdkEvent *event, NactMainWindow *window );
+
+static gboolean actually_delete_item( NactMainWindow *window, NAObject *item, NAUpdater *updater, GList **not_deleted, GSList **messages );
 
 static void     on_main_window_level_zero_order_changed( NactMainWindow *window, gpointer user_data );
 static void     on_iactions_list_selection_changed( NactIActionsList *instance, GSList *selected_items );
@@ -183,19 +192,14 @@ static gchar   *iactions_list_get_treeview_name( NactIActionsList *instance );
 
 static void     on_tab_updatable_item_updated( NactMainWindow *window, gpointer user_data, gboolean force_display );
 
-static gboolean confirm_for_giveup_from_menu( NactMainWindow *window );
-static gboolean confirm_for_giveup_from_pivot( NactMainWindow *window );
-static void     ipivot_consumer_on_items_changed( NAIPivotConsumer *instance, gpointer user_data );
 static void     on_settings_order_mode_changed( const gchar *group, const gchar *key, gconstpointer new_value, gboolean mandatory, NactMainWindow *window );
 static void     ipivot_consumer_on_io_provider_prefs_changed( NAIPivotConsumer *instance );
 static void     ipivot_consumer_on_mandatory_prefs_changed( NAIPivotConsumer *instance );
 static void     update_ui_after_provider_change( NactMainWindow *window );
-static void     reload( NactMainWindow *window );
 
 static gchar     *iabout_get_application_name( NAIAbout *instance );
 static GtkWindow *iabout_get_toplevel( NAIAbout *instance );
 
-static gboolean   on_delete_event( GtkWidget *toplevel, GdkEvent *event, NactMainWindow *window );
 
 GType
 nact_main_window_get_type( void )
@@ -351,10 +355,11 @@ class_init( NactMainWindowClass *klass )
 	st_parent_class = g_type_class_peek_parent( klass );
 
 	object_class = G_OBJECT_CLASS( klass );
-	object_class->dispose = instance_dispose;
-	object_class->finalize = instance_finalize;
 	object_class->set_property = instance_set_property;
 	object_class->get_property = instance_get_property;
+	object_class->constructed = instance_constructed;
+	object_class->dispose = instance_dispose;
+	object_class->finalize = instance_finalize;
 
 	spec = g_param_spec_pointer(
 			TAB_UPDATABLE_PROP_SELECTED_ITEM,
@@ -609,7 +614,7 @@ ipivot_consumer_iface_init( NAIPivotConsumerInterface *iface )
 	iface->on_display_about_changed = NULL;
 	iface->on_display_order_changed = NULL;
 	iface->on_io_provider_prefs_changed = ipivot_consumer_on_io_provider_prefs_changed;
-	iface->on_items_changed = ipivot_consumer_on_items_changed;
+	iface->on_items_changed = NULL;
 	iface->on_mandatory_prefs_changed = ipivot_consumer_on_mandatory_prefs_changed;
 }
 
@@ -628,18 +633,6 @@ instance_init( GTypeInstance *instance, gpointer klass )
 
 	self->private = g_new0( NactMainWindowPrivate, 1 );
 
-	base_window_signal_connect( BASE_WINDOW( instance ),
-			G_OBJECT( instance ), BASE_SIGNAL_INITIALIZE_GTK, G_CALLBACK( on_base_initialize_gtk_toplevel ));
-
-	base_window_signal_connect( BASE_WINDOW( instance ),
-			G_OBJECT( instance ), BASE_SIGNAL_INITIALIZE_WINDOW, G_CALLBACK( on_base_initialize_base_window ));
-
-	base_window_signal_connect( BASE_WINDOW( instance ),
-			G_OBJECT( instance ), BASE_SIGNAL_ALL_WIDGETS_SHOWED, G_CALLBACK( on_base_all_widgets_showed ));
-
-	base_window_signal_connect( BASE_WINDOW( instance ),
-			G_OBJECT( instance ), TAB_UPDATABLE_SIGNAL_ITEM_UPDATED, G_CALLBACK( on_tab_updatable_item_updated ));
-
 	self->private->dispose_has_run = FALSE;
 
 	na_ipivot_consumer_allow_notify( NA_IPIVOT_CONSUMER( instance ), TRUE, 0 );
@@ -714,6 +707,47 @@ instance_set_property( GObject *object, guint property_id, const GValue *value,
 }
 
 static void
+instance_constructed( GObject *window )
+{
+	static const gchar *thisfn = "nact_main_window_instance_constructed";
+	NactMainWindow *self;
+	NactApplication *application;
+
+	g_return_if_fail( NACT_IS_MAIN_WINDOW( window ));
+
+	self = NACT_MAIN_WINDOW( window );
+
+	if( !self->private->dispose_has_run ){
+		g_debug( "%s: window=%p (%s)", thisfn, ( void * ) window, G_OBJECT_TYPE_NAME( window ));
+
+		base_window_signal_connect( BASE_WINDOW( window ),
+				G_OBJECT( window ), BASE_SIGNAL_INITIALIZE_GTK, G_CALLBACK( on_base_initialize_gtk_toplevel ));
+
+		base_window_signal_connect( BASE_WINDOW( window ),
+				G_OBJECT( window ), BASE_SIGNAL_INITIALIZE_WINDOW, G_CALLBACK( on_base_initialize_base_window ));
+
+		base_window_signal_connect( BASE_WINDOW( window ),
+				G_OBJECT( window ), BASE_SIGNAL_ALL_WIDGETS_SHOWED, G_CALLBACK( on_base_all_widgets_showed ));
+
+		application = NACT_APPLICATION( base_window_get_application( BASE_WINDOW( window )));
+		self->private->updater = nact_application_get_updater( application );
+
+		base_window_signal_connect( BASE_WINDOW( window ),
+				G_OBJECT( self->private->updater ), PIVOT_SIGNAL_ITEMS_CHANGED, G_CALLBACK( on_pivot_items_changed ));
+
+		base_window_signal_connect( BASE_WINDOW( window ),
+				G_OBJECT( window ), TAB_UPDATABLE_SIGNAL_ITEM_UPDATED, G_CALLBACK( on_tab_updatable_item_updated ));
+
+		nact_menubar_new( BASE_WINDOW( window ));
+
+		/* chain up to the parent class */
+		if( G_OBJECT_CLASS( st_parent_class )->dispose ){
+			G_OBJECT_CLASS( st_parent_class )->dispose( window );
+		}
+	}
+}
+
+static void
 instance_dispose( GObject *window )
 {
 	static const gchar *thisfn = "nact_main_window_instance_dispose";
@@ -806,8 +840,6 @@ nact_main_window_new( const NactApplication *application )
 			BASE_PROP_WSP_NAME,       st_wsp_name,
 			NULL );
 
-	nact_menubar_new( BASE_WINDOW( window ));
-
 	return( window );
 }
 
@@ -961,11 +993,14 @@ on_base_all_widgets_showed( NactMainWindow *window, gpointer user_data )
 NactClipboard *
 nact_main_window_get_clipboard( const NactMainWindow *window )
 {
-	NactClipboard *clipboard = NULL;
+	NactClipboard *clipboard;
 
 	g_return_val_if_fail( NACT_IS_MAIN_WINDOW( window ), NULL );
 
+	clipboard = NULL;
+
 	if( !window->private->dispose_has_run ){
+
 		clipboard = window->private->clipboard;
 	}
 
@@ -1014,6 +1049,178 @@ nact_main_window_get_item( const NactMainWindow *window, const gchar *id )
 }
 
 /**
+ * nact_main_window_reload:
+ * @window: this #NactMainWindow instance.
+ *
+ * Refresh the list of items.
+ * If there is some non-yet saved modifications, a confirmation is
+ * required before giving up with them.
+ */
+void
+nact_main_window_reload( NactMainWindow *window )
+{
+	gboolean reload_ok;
+
+	g_return_if_fail( NACT_IS_MAIN_WINDOW( window ));
+
+	if( !window->private->dispose_has_run ){
+
+		reload_ok = confirm_for_giveup_from_menu( window );
+
+		if( reload_ok ){
+			reload_items( window );
+		}
+	}
+}
+
+/*
+ * The handler of the signal sent by NAPivot when items have been modified
+ * in the underlying storage subsystems
+ */
+static void
+on_pivot_items_changed( NAUpdater *updater, NactMainWindow *window )
+{
+	static const gchar *thisfn = "nact_main_window_on_pivot_items_changed";
+	gboolean reload_ok;
+
+	g_return_if_fail( NA_IS_UPDATER( updater ));
+	g_return_if_fail( NACT_IS_MAIN_WINDOW( window ));
+
+	if( !window->private->dispose_has_run ){
+		g_debug( "%s: updater=%p (%s), window=%p (%s)", thisfn,
+				( void * ) updater, G_OBJECT_TYPE_NAME( updater ), ( void * ) window, G_OBJECT_TYPE_NAME( window ));
+
+		reload_ok = confirm_for_giveup_from_pivot( window );
+
+		if( reload_ok ){
+			reload_items( window );
+		}
+	}
+}
+
+/*
+ * informs the user that the actions in underlying storage subsystem
+ * have changed, and propose for reloading
+ *
+ */
+static gboolean
+confirm_for_giveup_from_pivot( const NactMainWindow *window )
+{
+	gboolean reload_ok;
+	gchar *first, *second;
+
+	first = g_strdup(
+				_( "One or more actions have been modified in the filesystem.\n"
+					"You could keep to work with your current list of actions, "
+					"or you may want to reload a fresh one." ));
+
+	if( nact_main_window_has_modified_items( window )){
+
+		gchar *tmp = g_strdup_printf( "%s\n\n%s", first,
+				_( "Note that reloading a fresh list of actions requires "
+					"that you give up with your current modifications." ));
+		g_free( first );
+		first = tmp;
+	}
+
+	second = g_strdup( _( "Do you want to reload a fresh list of actions ?" ));
+
+	reload_ok = base_window_display_yesno_dlg( BASE_WINDOW( window ), first, second );
+
+	g_free( second );
+	g_free( first );
+
+	return( reload_ok );
+}
+
+/*
+ * requires a confirmation from the user when is has asked for reloading
+ * the actions via the Edit menu
+ */
+static gboolean
+confirm_for_giveup_from_menu( const NactMainWindow *window )
+{
+	gboolean reload_ok = TRUE;
+	gchar *first, *second;
+
+	if( nact_main_window_has_modified_items( window )){
+
+		first = g_strdup(
+					_( "Reloading a fresh list of actions requires "
+						"that you give up with your current modifications." ));
+
+		second = g_strdup( _( "Do you really want to do this ?" ));
+
+		reload_ok = base_window_display_yesno_dlg( BASE_WINDOW( window ), first, second );
+
+		g_free( second );
+		g_free( first );
+	}
+
+	return( reload_ok );
+}
+
+static void
+reload_items( NactMainWindow *window )
+{
+	static const gchar *thisfn = "nact_main_window_reload";
+	GList *tree;
+
+	g_debug( "%s: window=%p", thisfn, ( void * ) window );
+
+	window->private->selected_item = NULL;
+	window->private->selected_profile = NULL;
+
+	na_object_unref_items( window->private->deleted );
+	window->private->deleted = NULL;
+
+	tree = na_updater_load_items( window->private->updater );
+	nact_iactions_list_fill( NACT_IACTIONS_LIST( window ), tree );
+	nact_iactions_list_bis_select_first_row( NACT_IACTIONS_LIST( window ));
+}
+
+static gboolean
+base_is_willing_to_quit( const BaseWindow *window )
+{
+	static const gchar *thisfn = "nact_main_window_is_willing_to_quit";
+	gboolean willing_to;
+
+	g_debug( "%s: window=%p", thisfn, ( void * ) window );
+
+	willing_to = TRUE;
+	if( nact_main_window_has_modified_items( NACT_MAIN_WINDOW( window ))){
+		willing_to = nact_confirm_logout_run( NACT_MAIN_WINDOW( window ));
+	}
+
+	/* call parent class */
+	if( willing_to ){
+		if( BASE_WINDOW_CLASS( st_parent_class )->is_willing_to_quit ){
+			willing_to = BASE_WINDOW_CLASS( st_parent_class )->is_willing_to_quit( window );
+		}
+	}
+
+	return( willing_to );
+}
+
+/*
+ * triggered when the user clicks on the top right [X] button
+ * returns %TRUE to stop the signal to be propagated (which would cause the
+ * window to be destroyed); instead we gracefully quit the application
+ */
+static gboolean
+on_delete_event( GtkWidget *toplevel, GdkEvent *event, NactMainWindow *window )
+{
+	static const gchar *thisfn = "nact_main_window_on_delete_event";
+
+	g_debug( "%s: toplevel=%p, event=%p, window=%p",
+			thisfn, ( void * ) toplevel, ( void * ) event, ( void * ) window );
+
+	nact_main_menubar_file_on_quit( NULL, window );
+
+	return( TRUE );
+}
+
+/**
  * nact_main_window_has_modified_items:
  * @window: this #NactMainWindow instance.
  *
@@ -1088,31 +1295,6 @@ nact_main_window_move_to_deleted( NactMainWindow *window, GList *items )
 }
 
 /**
- * nact_main_window_reload:
- * @window: this #NactMainWindow instance.
- *
- * Refresh the list of items.
- * If there is some non-yet saved modifications, a confirmation is
- * required before giving up with them.
- */
-void
-nact_main_window_reload( NactMainWindow *window )
-{
-	gboolean reload_ok;
-
-	g_return_if_fail( NACT_IS_MAIN_WINDOW( window ));
-
-	if( !window->private->dispose_has_run ){
-
-		reload_ok = confirm_for_giveup_from_menu( window );
-
-		if( reload_ok ){
-			reload( window );
-		}
-	}
-}
-
-/**
  * nact_main_window_remove_deleted:
  * @window: this #NactMainWindow instance.
  * @messages: a pointer to a #GSList of error messages.
@@ -1212,29 +1394,6 @@ actually_delete_item( NactMainWindow *window, NAObject *item, NAUpdater *updater
 	return( delete_ok );
 }
 
-static gboolean
-base_is_willing_to_quit( const BaseWindow *window )
-{
-	static const gchar *thisfn = "nact_main_window_is_willing_to_quit";
-	gboolean willing_to;
-
-	g_debug( "%s: window=%p", thisfn, ( void * ) window );
-
-	willing_to = TRUE;
-	if( nact_main_window_has_modified_items( NACT_MAIN_WINDOW( window ))){
-		willing_to = nact_confirm_logout_run( NACT_MAIN_WINDOW( window ));
-	}
-
-	/* call parent class */
-	if( willing_to ){
-		if( BASE_WINDOW_CLASS( st_parent_class )->is_willing_to_quit ){
-			willing_to = BASE_WINDOW_CLASS( st_parent_class )->is_willing_to_quit( window );
-		}
-	}
-
-	return( willing_to );
-}
-
 static void
 on_main_window_level_zero_order_changed( NactMainWindow *window, gpointer user_data )
 {
@@ -1405,98 +1564,6 @@ on_tab_updatable_item_updated( NactMainWindow *window, gpointer user_data, gbool
 }
 
 /*
- * requires a confirmation from the user when is has asked for reloading
- * the actions via the Edit menu
- */
-static gboolean
-confirm_for_giveup_from_menu( NactMainWindow *window )
-{
-	gboolean reload_ok = TRUE;
-	gchar *first, *second;
-
-	if( nact_main_window_has_modified_items( window )){
-
-		first = g_strdup(
-					_( "Reloading a fresh list of actions requires "
-						"that you give up with your current modifications." ));
-
-		second = g_strdup( _( "Do you really want to do this ?" ));
-
-		reload_ok = base_window_display_yesno_dlg( BASE_WINDOW( window ), first, second );
-
-		g_free( second );
-		g_free( first );
-	}
-
-	return( reload_ok );
-}
-
-/*
- * informs the user that the actions in underlying storage subsystem
- * have changed, and propose for reloading
- *
- */
-static gboolean
-confirm_for_giveup_from_pivot( NactMainWindow *window )
-{
-	gboolean reload_ok;
-	gchar *first, *second;
-
-	first = g_strdup(
-				_( "One or more actions have been modified in the filesystem.\n"
-					"You could keep to work with your current list of actions, "
-					"or you may want to reload a fresh one." ));
-
-	if( nact_main_window_has_modified_items( window )){
-
-		gchar *tmp = g_strdup_printf( "%s\n\n%s", first,
-				_( "Note that reloading a fresh list of actions requires "
-					"that you give up with your current modifications." ));
-		g_free( first );
-		first = tmp;
-	}
-
-	second = g_strdup( _( "Do you want to reload a fresh list of actions ?" ));
-
-	reload_ok = base_window_display_yesno_dlg( BASE_WINDOW( window ), first, second );
-
-	g_free( second );
-	g_free( first );
-
-	return( reload_ok );
-}
-
-/*
- * called by NAPivot because this window implements the IIOConsumer
- * interface, i.e. it wish to be advertised when the list of actions
- * changes in the underlying I/O storage subsystem (typically, when we
- * save the modifications)
- *
- * note that we only reload the full list of actions when asking for a
- * reset - saving is handled on a per-action basis.
- */
-static void
-ipivot_consumer_on_items_changed( NAIPivotConsumer *instance, gpointer user_data )
-{
-	static const gchar *thisfn = "nact_main_window_ipivot_consumer_on_items_changed";
-	NactMainWindow *window;
-	gboolean reload_ok;
-
-	g_debug( "%s: instance=%p, user_data=%p", thisfn, ( void * ) instance, ( void * ) user_data );
-	g_return_if_fail( NACT_IS_MAIN_WINDOW( instance ));
-	window = NACT_MAIN_WINDOW( instance );
-
-	if( !window->private->dispose_has_run ){
-
-		reload_ok = confirm_for_giveup_from_pivot( window );
-
-		if( reload_ok ){
-			reload( window );
-		}
-	}
-}
-
-/*
  * NASettings callback for a change on NA_IPREFS_ITEMS_LIST_ORDER_MODE key
  */
 static void
@@ -1557,33 +1624,6 @@ update_ui_after_provider_change( NactMainWindow *window )
 	}
 }
 
-static void
-reload( NactMainWindow *window )
-{
-	static const gchar *thisfn = "nact_main_window_reload";
-	NactApplication *application;
-	NAUpdater *updater;
-	GList *tree;
-
-	g_debug( "%s: window=%p", thisfn, ( void * ) window );
-	g_return_if_fail( NACT_IS_MAIN_WINDOW( window ));
-
-	if( !window->private->dispose_has_run ){
-
-		window->private->selected_item = NULL;
-		window->private->selected_profile = NULL;
-
-		na_object_unref_items( window->private->deleted );
-		window->private->deleted = NULL;
-
-		application = NACT_APPLICATION( base_window_get_application( BASE_WINDOW( window )));
-		updater = nact_application_get_updater( application );
-		tree = na_updater_load_items( updater );
-		nact_iactions_list_fill( NACT_IACTIONS_LIST( window ), tree );
-		nact_iactions_list_bis_select_first_row( NACT_IACTIONS_LIST( window ));
-	}
-}
-
 static gchar *
 iabout_get_application_name( NAIAbout *instance )
 {
@@ -1604,21 +1644,3 @@ iabout_get_toplevel( NAIAbout *instance )
 
 	return( base_window_get_gtk_toplevel( BASE_WINDOW( instance )));
 }
-
-/*
- * triggered when the user clicks on the top right [X] button
- * returns %TRUE to stop the signal to be propagated (which would cause the
- * window to be destroyed); instead we gracefully quit the application
- */
-static gboolean
-on_delete_event( GtkWidget *toplevel, GdkEvent *event, NactMainWindow *window )
-{
-	static const gchar *thisfn = "nact_main_window_on_delete_event";
-
-	g_debug( "%s: toplevel=%p, event=%p, window=%p",
-			thisfn, ( void * ) toplevel, ( void * ) event, ( void * ) window );
-
-	nact_main_menubar_file_on_quit( NULL, window );
-
-	return( TRUE );
-}
diff --git a/src/test/test-reader.c b/src/test/test-reader.c
index 7f3d7ec..e96818c 100755
--- a/src/test/test-reader.c
+++ b/src/test/test-reader.c
@@ -73,12 +73,8 @@ main( int argc, char **argv )
 	check_options( argc, argv, context );
 
 	NAPivot *pivot = na_pivot_new();
-	/* for test */
-	/*na_pivot_register_consumer( pivot, NA_IPIVOT_CONSUMER( self ));*/
-	na_pivot_set_automatic_reload( pivot, TRUE );
 	na_pivot_set_loadable( pivot, !PIVOT_LOAD_DISABLED & !PIVOT_LOAD_INVALID );
 	na_pivot_load_items( pivot );
-	/* for test - end */
 
 	parms.parent = NULL;
 	parms.uris = g_slist_prepend( NULL, uri );