GNOME.org
 

[nautilus-actions] Setup construction properties

commit 382b6a77418c959e034cddac935b2a53a2b6db59
Author: Pierre Wieser <pwieser trychlos org>
Date:   Thu Feb 3 01:19:39 2011 +0100

    Setup construction properties

 ChangeLog                   |   10 +++++
 src/nact/base-application.c |   16 ++++-----
 src/nact/base-assistant.c   |    4 +-
 src/nact/base-window.c      |   84 ++++++++++++++++++++++++++----------------
 src/nact/nact-application.c |    2 +-
 src/nact/nact-application.h |    2 +-
 src/nact/nact-main-window.c |   43 +++++-----------------
 7 files changed, 82 insertions(+), 79 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 78e25a7..ec376b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2011-02-02 Pierre Wieser <pwieser trychlos org>
 
+	* src/nact/base-application.c (class_init):
+	* src/nact/base-assistant.c (class_init):
+	* src/nact/base-window.c (class_init):
+	* src/nact/nact-main-window.c (instance_constructed):
+	Setup construction properties.
+
+	* src/nact/nact-application.c:
+	* src/nact/nact-application.h (nact_application_get_updater):
+	Set NactApplication as a const argument.
+
 	Deprecate NAIPivotConsumer interface
 
 	* src/core/na-ipivot-consumer.c:
diff --git a/src/nact/base-application.c b/src/nact/base-application.c
index 876600a..4991b96 100644
--- a/src/nact/base-application.c
+++ b/src/nact/base-application.c
@@ -169,7 +169,7 @@ class_init( BaseApplicationClass *klass )
 					_( "Arguments count" ),
 					_( "The count of command-line arguments" ),
 					0, 65535, 0,
-					G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE ));
+					G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE ));
 
 	g_object_class_install_property( object_class, BASE_PROP_ARGV_ID,
 			g_param_spec_boxed(
@@ -177,14 +177,14 @@ class_init( BaseApplicationClass *klass )
 					_( "Arguments" ),
 					_( "The array of command-line arguments" ),
 					G_TYPE_STRV,
-					G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE ));
+					G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE ));
 
 	g_object_class_install_property( object_class, BASE_PROP_OPTIONS_ID,
 			g_param_spec_pointer(
 					BASE_PROP_OPTIONS,
 					_( "Option entries" ),
 					_( "The array of command-line option definitions" ),
-					G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE ));
+					G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE ));
 
 	g_object_class_install_property( object_class, BASE_PROP_APPLICATION_NAME_ID,
 			g_param_spec_string(
@@ -192,7 +192,7 @@ class_init( BaseApplicationClass *klass )
 					_( "Application name" ),
 					_( "The name of the application" ),
 					"",
-					G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE ));
+					G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE ));
 
 	g_object_class_install_property( object_class, BASE_PROP_DESCRIPTION_ID,
 			g_param_spec_string(
@@ -200,7 +200,7 @@ class_init( BaseApplicationClass *klass )
 					_( "Description" ),
 					_( "A short description to be displayed in the first line of --help output" ),
 					"",
-					G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE ));
+					G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE ));
 
 	g_object_class_install_property( object_class, BASE_PROP_ICON_NAME_ID,
 			g_param_spec_string(
@@ -208,7 +208,7 @@ class_init( BaseApplicationClass *klass )
 					_( "Icon name" ),
 					_( "The name of the icon of the application" ),
 					"",
-					G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE ));
+					G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE ));
 
 	g_object_class_install_property( object_class, BASE_PROP_UNIQUE_APP_NAME_ID,
 			g_param_spec_string(
@@ -216,7 +216,7 @@ class_init( BaseApplicationClass *klass )
 					_( "UniqueApp name" ),
 					_( "The Unique name of the application" ),
 					"",
-					G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE ));
+					G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE ));
 
 	klass->private = g_new0( BaseApplicationClassPrivate, 1 );
 
@@ -510,8 +510,6 @@ appli_initialize_gtk( BaseApplication *application, int *code )
 	textdomain( GETTEXT_PACKAGE );
 #endif
 
-	gtk_set_locale();
-
 	/* setup default Gtk+ application name
 	 * must have been set at instanciationtime by the derived class
 	 */
diff --git a/src/nact/base-assistant.c b/src/nact/base-assistant.c
index 11ae686..90af190 100644
--- a/src/nact/base-assistant.c
+++ b/src/nact/base-assistant.c
@@ -157,7 +157,7 @@ class_init( BaseAssistantClass *klass )
 					_( "Quit on Escape" ),
 					_( "Does the assistant should 'Quit' when the user hits the Escape key ?" ),
 					FALSE,
-					G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE ));
+					G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE ));
 
 	g_object_class_install_property( object_class, BASE_PROP_WARN_ON_ESCAPE_ID,
 			g_param_spec_boolean(
@@ -165,7 +165,7 @@ class_init( BaseAssistantClass *klass )
 					_( "Warn on Escape" ),
 					_( "Does the user should confirm when quitting the assistant on Escape key ?" ),
 					FALSE,
-					G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE ));
+					G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE ));
 
 	base_class = BASE_WINDOW_CLASS( klass );
 	base_class->run = do_run;
diff --git a/src/nact/base-window.c b/src/nact/base-window.c
index 5367da5..82d6999 100644
--- a/src/nact/base-window.c
+++ b/src/nact/base-window.c
@@ -110,8 +110,9 @@ static void     class_init( BaseWindowClass *klass );
 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_dispose( GObject *application );
-static void     instance_finalize( GObject *application );
+static void     instance_constructed( GObject *window );
+static void     instance_dispose( GObject *window );
+static void     instance_finalize( GObject *window );
 
 /* initialization process
  */
@@ -182,24 +183,25 @@ class_init( BaseWindowClass *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->get_property = instance_get_property;
 	object_class->set_property = instance_set_property;
+	object_class->constructed = instance_constructed;
+	object_class->dispose = instance_dispose;
+	object_class->finalize = instance_finalize;
 
 	g_object_class_install_property( object_class, BASE_PROP_PARENT_ID,
 			g_param_spec_pointer(
 					BASE_PROP_PARENT,
 					_( "Parent BaseWindow" ),
 					_( "A pointer (not a reference) to the BaseWindow parent of this BaseWindow" ),
-					G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE ));
+					G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE ));
 
 	g_object_class_install_property( object_class, BASE_PROP_APPLICATION_ID,
 			g_param_spec_pointer(
-				BASE_PROP_APPLICATION,
-				_( "BaseApplication" ),
-				_( "A pointer (not a reference) to the BaseApplication instance" ),
-				G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE ));
+					BASE_PROP_APPLICATION,
+					_( "BaseApplication" ),
+					_( "A pointer (not a reference) to the BaseApplication instance" ),
+					G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE ));
 
 	g_object_class_install_property( object_class, BASE_PROP_XMLUI_FILENAME_ID,
 			g_param_spec_string(
@@ -207,7 +209,7 @@ class_init( BaseWindowClass *klass )
 					_( "XML UI filename" ),
 					_( "The filename which contains the XML UI definition" ),
 					"",
-					G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE ));
+					G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE ));
 
 	g_object_class_install_property( object_class, BASE_PROP_HAS_OWN_BUILDER_ID,
 			g_param_spec_boolean(
@@ -215,7 +217,7 @@ class_init( BaseWindowClass *klass )
 					_( "Has its own GtkBuilder" ),
 					_( "Whether this BaseWindow reallocates a new GtkBuilder each time it is opened" ),
 					FALSE,
-					G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE ));
+					G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE ));
 
 	g_object_class_install_property( object_class, BASE_PROP_TOPLEVEL_NAME_ID,
 			g_param_spec_string(
@@ -223,7 +225,7 @@ class_init( BaseWindowClass *klass )
 					_( "Toplevel name" ),
 					_( "The internal GtkBuildable name of the toplevel window" ),
 					"",
-					G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE ));
+					G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE ));
 
 	g_object_class_install_property( object_class, BASE_PROP_WSP_NAME_ID,
 			g_param_spec_string(
@@ -231,7 +233,7 @@ class_init( BaseWindowClass *klass )
 					_( "WSP name" ),
 					_( "The string which handles the window size and position in user preferences" ),
 					"",
-					G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE ));
+					G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE ));
 
 	klass->private = g_new0( BaseWindowClassPrivate, 1 );
 
@@ -318,7 +320,7 @@ instance_init( GTypeInstance *instance, gpointer klass )
 	self = BASE_WINDOW( instance );
 
 	/* at a first glance, we may suppose that this first window is the main one
-	 * if this is not the case, we have to write some more code
+	 * if this is not the case, we would have to write some more code
 	 */
 	if( !st_first_window ){
 		st_first_window = self;
@@ -418,6 +420,28 @@ instance_set_property( GObject *object, guint property_id, const GValue *value,
 }
 
 static void
+instance_constructed( GObject *window )
+{
+	static const gchar *thisfn = "base_window_instance_constructed";
+	BaseWindow *self;
+
+	g_return_if_fail( BASE_IS_WINDOW( window ));
+
+	self = BASE_WINDOW( window );
+
+	if( !self->private->dispose_has_run ){
+		g_debug( "%s: window=%p (%s)", thisfn, ( void * ) window, G_OBJECT_TYPE_NAME( window ));
+
+		g_debug( "%s: application=%p", thisfn, ( void * ) self->private->application );
+
+		/* chain up to the parent class */
+		if( G_OBJECT_CLASS( st_parent_class )->constructed ){
+			G_OBJECT_CLASS( st_parent_class )->constructed( window );
+		}
+	}
+}
+
+static void
 instance_dispose( GObject *window )
 {
 	static const gchar *thisfn = "base_window_instance_dispose";
@@ -429,7 +453,6 @@ instance_dispose( GObject *window )
 	self = BASE_WINDOW( window );
 
 	if( !self->private->dispose_has_run ){
-
 		g_debug( "%s: window=%p (%s)", thisfn, ( void * ) window, G_OBJECT_TYPE_NAME( window ));
 
 		base_gtk_utils_save_window_position( self, self->private->wsp_name );
@@ -540,7 +563,7 @@ base_window_init( BaseWindow *window )
 	if( !window->private->dispose_has_run &&
 		!window->private->initialized ){
 
-		g_debug( "%s: window=%p", thisfn, ( void * ) window );
+		g_debug( "%s: window=%p (%s)", thisfn, ( void * ) window, G_OBJECT_TYPE_NAME( window ));
 
 		if( !window->private->application ){
 			g_return_val_if_fail( window->private->parent, FALSE );
@@ -675,9 +698,10 @@ on_initialize_gtk_toplevel_class_handler( BaseWindow *window, GtkWindow *topleve
 
 	g_return_if_fail( BASE_IS_WINDOW( window ));
 
-	g_debug( "%s: window=%p, toplevel=%p", thisfn, ( void * ) window, ( void * ) toplevel );
-
 	if( !window->private->dispose_has_run ){
+		g_debug( "%s: window=%p (%s), toplevel=%p (%s)", thisfn,
+				( void * ) window, G_OBJECT_TYPE_NAME( window ),
+				( void * ) toplevel, G_OBJECT_TYPE_NAME( toplevel ));
 
 		if( BASE_WINDOW_GET_CLASS( window )->initialize_gtk_toplevel ){
 			BASE_WINDOW_GET_CLASS( window )->initialize_gtk_toplevel( window, toplevel );
@@ -695,16 +719,14 @@ do_initialize_gtk_toplevel( BaseWindow *window, GtkWindow *toplevel )
 	g_return_if_fail( GTK_IS_WINDOW( toplevel ));
 	g_return_if_fail( toplevel == window->private->gtk_toplevel );
 
-	g_debug( "%s: window=%p, toplevel=%p", thisfn, ( void * ) window, ( void * ) toplevel );
-
 	if( !window->private->dispose_has_run ){
-
-		g_debug( "%s: parent=%p (%s)", thisfn,
+		g_debug( "%s: window=%p (%s), toplevel=%p (%s), parent=%p (%s)", thisfn,
+				( void * ) window, G_OBJECT_TYPE_NAME( window ),
+				( void * ) toplevel, G_OBJECT_TYPE_NAME( toplevel ),
 				( void * ) window->private->parent,
 				window->private->parent ? G_OBJECT_TYPE_NAME( window->private->parent ) : "null" );
 
 		if( window->private->parent ){
-
 			g_return_if_fail( BASE_IS_WINDOW( window->private->parent ));
 			parent_gtk_toplevel = base_window_get_gtk_toplevel( BASE_WINDOW( window->private->parent ));
 			gtk_window_set_transient_for( toplevel, parent_gtk_toplevel );
@@ -745,7 +767,7 @@ base_window_run( BaseWindow *window )
 
 		} else {
 			g_return_val_if_fail( GTK_IS_WINDOW( window->private->gtk_toplevel ), code );
-			g_debug( "%s: window=%p", thisfn, ( void * ) window );
+			g_debug( "%s: window=%p (%s)", thisfn, ( void * ) window, G_OBJECT_TYPE_NAME( window ));
 
 			code = BASE_EXIT_CODE_OK;
 			g_signal_emit_by_name( window, BASE_SIGNAL_INITIALIZE_WINDOW );
@@ -773,9 +795,8 @@ on_initialize_base_window_class_handler( BaseWindow *window )
 
 	g_return_if_fail( BASE_IS_WINDOW( window ));
 
-	g_debug( "%s: window=%p", thisfn, ( void * ) window );
-
 	if( !window->private->dispose_has_run ){
+		g_debug( "%s: window=%p (%s)", thisfn, ( void * ) window, G_OBJECT_TYPE_NAME( window ));
 
 		if( BASE_WINDOW_GET_CLASS( window )->initialize_base_window ){
 			BASE_WINDOW_GET_CLASS( window )->initialize_base_window( window );
@@ -790,9 +811,8 @@ do_initialize_base_window( BaseWindow *window )
 
 	g_return_if_fail( BASE_IS_WINDOW( window ));
 
-	g_debug( "%s: window=%p", thisfn, ( void * ) window );
-
 	if( !window->private->dispose_has_run ){
+		g_debug( "%s: window=%p (%s)", thisfn, ( void * ) window, G_OBJECT_TYPE_NAME( window ));
 
 		base_gtk_utils_restore_window_position( window, window->private->wsp_name );
 	}
@@ -805,9 +825,8 @@ on_all_widgets_showed_class_handler( BaseWindow *window )
 
 	g_return_if_fail( BASE_IS_WINDOW( window ));
 
-	g_debug( "%s: window=%p", thisfn, ( void * ) window );
-
 	if( !window->private->dispose_has_run ){
+		g_debug( "%s: window=%p (%s)", thisfn, ( void * ) window, G_OBJECT_TYPE_NAME( window ));
 
 		if( BASE_WINDOW_GET_CLASS( window )->all_widgets_showed ){
 			BASE_WINDOW_GET_CLASS( window )->all_widgets_showed( window );
@@ -875,8 +894,9 @@ on_delete_event( GtkWidget *toplevel, GdkEvent *event, BaseWindow *window )
 
 	g_return_val_if_fail( BASE_IS_WINDOW( window ), FALSE );
 
-	g_debug( "%s: toplevel=%p, event=%p, window=%p",
-			thisfn, ( void * ) toplevel, ( void * ) event, ( void * ) window );
+	g_debug( "%s: toplevel=%p (%s), event=%p, window=%p (%s)",
+			thisfn, ( void * ) toplevel, G_OBJECT_TYPE_NAME( toplevel ),
+			( void * ) event, ( void * ) window, G_OBJECT_TYPE_NAME( window ));
 
 	return( stop );
 }
diff --git a/src/nact/nact-application.c b/src/nact/nact-application.c
index 696872e..eff380c 100644
--- a/src/nact/nact-application.c
+++ b/src/nact/nact-application.c
@@ -364,7 +364,7 @@ appli_main_window_new( const BaseApplication *application, int *code )
  * It should not be g_free() not g_object_unref() by the caller.
  */
 NAUpdater *
-nact_application_get_updater( NactApplication *application )
+nact_application_get_updater( const NactApplication *application )
 {
 	NAUpdater *updater = NULL;
 
diff --git a/src/nact/nact-application.h b/src/nact/nact-application.h
index fb36ef9..a7e1c18 100644
--- a/src/nact/nact-application.h
+++ b/src/nact/nact-application.h
@@ -74,7 +74,7 @@ GType            nact_application_get_type( void );
 
 NactApplication *nact_application_new_with_args( int argc, char **argv );
 
-NAUpdater       *nact_application_get_updater( NactApplication *application );
+NAUpdater       *nact_application_get_updater( const NactApplication *application );
 
 G_END_DECLS
 
diff --git a/src/nact/nact-main-window.c b/src/nact/nact-main-window.c
index 93f61d5..a5d4041 100644
--- a/src/nact/nact-main-window.c
+++ b/src/nact/nact-main-window.c
@@ -710,8 +710,8 @@ instance_constructed( GObject *window )
 		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 );
+		if( G_OBJECT_CLASS( st_parent_class )->constructed ){
+			G_OBJECT_CLASS( st_parent_class )->constructed( window );
 		}
 	}
 }
@@ -724,8 +724,6 @@ instance_dispose( GObject *window )
 	GtkWidget *pane;
 	gint pos;
 	GList *it;
-	NactApplication *application;
-	NAUpdater *updater;
 	NASettings *settings;
 
 	g_return_if_fail( NACT_IS_MAIN_WINDOW( window ));
@@ -739,9 +737,7 @@ instance_dispose( GObject *window )
 
 		g_object_unref( self->private->clipboard );
 
-		application = NACT_APPLICATION( base_window_get_application( BASE_WINDOW( self )));
-		updater = nact_application_get_updater( application );
-		settings = na_pivot_get_settings( NA_PIVOT( updater ));
+		settings = na_pivot_get_settings( NA_PIVOT( self->private->updater ));
 
 		pane = base_window_get_widget( BASE_WINDOW( window ), "MainPaned" );
 		pos = gtk_paned_get_position( GTK_PANED( pane ));
@@ -851,8 +847,6 @@ static void
 on_base_initialize_base_window( NactMainWindow *window, gpointer user_data )
 {
 	static const gchar *thisfn = "nact_main_window_on_base_initialize_base_window";
-	NactApplication *application;
-	NAUpdater *updater;
 	NASettings *settings;
 	guint pos;
 	GtkWidget *pane;
@@ -863,9 +857,7 @@ on_base_initialize_base_window( NactMainWindow *window, gpointer user_data )
 	if( !window->private->dispose_has_run ){
 		g_debug( "%s: window=%p, user_data=%p", thisfn, ( void * ) window, ( void * ) user_data );
 
-		application = NACT_APPLICATION( base_window_get_application( BASE_WINDOW( window )));
-		updater = nact_application_get_updater( application );
-		settings = na_pivot_get_settings( NA_PIVOT( updater ));
+		settings = na_pivot_get_settings( NA_PIVOT( window->private->updater ));
 
 		pos = na_settings_get_uint( settings, NA_IPREFS_MAIN_PANED, NULL, NULL );
 		if( pos ){
@@ -893,7 +885,7 @@ on_base_initialize_base_window( NactMainWindow *window, gpointer user_data )
 
 		/* fill the IActionsList at last so that all signals are connected
 		 */
-		tree = na_updater_load_items( updater );
+		tree = na_updater_load_items( window->private->updater );
 		g_debug( "%s: pivot_tree=%p", thisfn, ( void * ) tree );
 		nact_iactions_list_runtime_init_toplevel( NACT_IACTIONS_LIST( window ), tree );
 
@@ -993,8 +985,6 @@ NAObjectItem *
 nact_main_window_get_item( const NactMainWindow *window, const gchar *id )
 {
 	NAObjectItem *exists;
-	NactApplication *application;
-	NAUpdater *updater;
 
 	g_return_val_if_fail( NACT_IS_MAIN_WINDOW( window ), FALSE );
 
@@ -1004,9 +994,7 @@ nact_main_window_get_item( const NactMainWindow *window, const gchar *id )
 
 		/* leave here this dead code, in case I change of opinion later */
 		if( 0 ){
-			application = NACT_APPLICATION( base_window_get_application( BASE_WINDOW( window )));
-			updater = nact_application_get_updater( application );
-			exists = na_pivot_get_item( NA_PIVOT( updater ), id );
+			exists = na_pivot_get_item( NA_PIVOT( window->private->updater ), id );
 		}
 
 		if( !exists ){
@@ -1286,8 +1274,6 @@ gboolean
 nact_main_window_remove_deleted( NactMainWindow *window, GSList **messages )
 {
 	gboolean delete_ok = TRUE;
-	NactApplication *application;
-	NAUpdater *updater;
 	GList *it;
 	NAObject *item;
 	GList *not_deleted;
@@ -1296,13 +1282,11 @@ nact_main_window_remove_deleted( NactMainWindow *window, GSList **messages )
 
 	if( !window->private->dispose_has_run ){
 
-		application = NACT_APPLICATION( base_window_get_application( BASE_WINDOW( window )));
-		updater = nact_application_get_updater( application );
 		not_deleted = NULL;
 
 		for( it = window->private->deleted ; it ; it = it->next ){
 			item = NA_OBJECT( it->data );
-			delete_ok = actually_delete_item( window, item, updater, &not_deleted, messages );
+			delete_ok = actually_delete_item( window, item, window->private->updater, &not_deleted, messages );
 		}
 
 		na_object_unref_items( window->private->deleted );
@@ -1497,14 +1481,9 @@ setup_dialog_title( NactMainWindow *window )
 static void
 setup_writability_status( NactMainWindow *window )
 {
-	NactApplication *application;
-	NAUpdater *updater;
-
 	g_return_if_fail( NA_IS_OBJECT_ITEM( window->private->selected_item ));
 
-	application = NACT_APPLICATION( base_window_get_application( BASE_WINDOW( window )));
-	updater = nact_application_get_updater( application );
-	window->private->editable = na_updater_is_item_writable( updater, window->private->selected_item, &window->private->reason );
+	window->private->editable = na_updater_is_item_writable( window->private->updater, window->private->selected_item, &window->private->reason );
 	nact_main_statusbar_set_locked( window, !window->private->editable, window->private->reason );
 }
 
@@ -1541,8 +1520,6 @@ on_settings_order_mode_changed( const gchar *group, const gchar *key, gconstpoin
 	static const gchar *thisfn = "nact_main_window_on_settings_order_mode_changed";
 	const gchar *order_mode_str;
 	guint order_mode;
-	NactApplication *application;
-	NAUpdater *updater;
 	GList *tree;
 
 	g_return_if_fail( NACT_IS_MAIN_WINDOW( window ));
@@ -1559,9 +1536,7 @@ on_settings_order_mode_changed( const gchar *group, const gchar *key, gconstpoin
 		nact_iactions_list_display_order_change( NACT_IACTIONS_LIST( window ), order_mode );
 		nact_sort_buttons_display_order_change( window, order_mode );
 
-		application = NACT_APPLICATION( base_window_get_application( BASE_WINDOW( window )));
-		updater = nact_application_get_updater( application );
-		tree = na_pivot_get_items( NA_PIVOT( updater ));
+		tree = na_pivot_get_items( NA_PIVOT( window->private->updater ));
 
 		if( g_list_length( tree )){
 			g_signal_emit_by_name( window,
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]