[nautilus-actions] Only use na_updater_are_preferences_locked() function

[Pierre Wieser <pwieser src gnome org>]

commit 829025f6bd22677b78fba66d8ea3280fe64dcd14
Author: Pierre Wieser <pwieser trychlos org>
Date:   Sat Feb 19 17:13:04 2011 +0100

    Only use na_updater_are_preferences_locked() function

 ChangeLog                      |    4 +++
 src/nact/nact-providers-list.c |   45 +++++++++++++++++----------------------
 src/nact/nact-schemes-list.c   |   27 ++++-------------------
 3 files changed, 29 insertions(+), 47 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 3ea72d2..2255641 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-02-19 Pierre Wieser <pwieser trychlos org>
 
+	* src/nact/nact-providers-list.c:
+	* src/nact/nact-schemes-list.c: Does not recompute if preferences are
+	locked, but use na_updater_are_preferences_locked() function.
+
 	* src/api/na-iio-provider.h:
 	Define new reason when the level zero is not writable.
 
diff --git a/src/nact/nact-providers-list.c b/src/nact/nact-providers-list.c
index 2101dcd..72ed642 100644
--- a/src/nact/nact-providers-list.c
+++ b/src/nact/nact-providers-list.c
@@ -100,7 +100,6 @@ static void               on_writable_toggled( GtkCellRendererToggle *renderer,
 static void               on_up_clicked( GtkButton *button, BaseWindow *window );
 static void               on_down_clicked( GtkButton *button, BaseWindow *window );
 
-static gboolean           are_preferences_locked( BaseWindow *window );
 static void               display_label( GtkTreeViewColumn *column, GtkCellRenderer *cell, GtkTreeModel *model, GtkTreeIter *iter, ProvidersListData *data );
 static GtkButton         *get_up_button( BaseWindow *window );
 static GtkButton         *get_down_button( BaseWindow *window );
@@ -202,6 +201,8 @@ nact_providers_list_init_view( BaseWindow *window, GtkTreeView *treeview )
 {
 	static const gchar *thisfn = "nact_providers_list_init_view";
 	ProvidersListData *data;
+	NactApplication *application;
+	NAUpdater *updater;
 
 	g_return_if_fail( BASE_IS_WINDOW( window ));
 	g_return_if_fail( GTK_IS_TREE_VIEW( treeview ));
@@ -212,7 +213,9 @@ nact_providers_list_init_view( BaseWindow *window, GtkTreeView *treeview )
 
 	data = get_providers_list_data( treeview );
 	data->window = window;
-	data->preferences_locked = are_preferences_locked( window );
+	application = NACT_APPLICATION( base_window_get_application( window ));
+	updater = nact_application_get_updater( application );
+	data->preferences_locked = na_updater_are_preferences_locked( updater );
 
 	init_view_setup_providers( treeview, window );
 	init_view_connect_signals( treeview, window );
@@ -443,11 +446,13 @@ on_selection_changed( GtkTreeSelection *selection, BaseWindow *window )
 	GtkButton *button;
 	GtkTreePath *path;
 	gboolean may_up, may_down;
-	gboolean preferences_locked, order_mandatory;
+	gboolean order_mandatory;
 	GSList *write_order;
 	NactApplication *application;
 	NAUpdater *updater;
 	NASettings *settings;
+	ProvidersListData *data;
+	GtkTreeView *treeview;
 
 	g_debug( "nact_providers_list_on_selection_changed: selection=%p, window=%p (%s)",
 			( void * ) selection, ( void * ) window, G_OBJECT_TYPE_NAME( window ));
@@ -455,13 +460,15 @@ on_selection_changed( GtkTreeSelection *selection, BaseWindow *window )
 	may_up = FALSE;
 	may_down = FALSE;
 
+	treeview = GTK_TREE_VIEW( g_object_get_data( G_OBJECT( window ), PROVIDERS_LIST_TREEVIEW ));
+	data = get_providers_list_data( treeview );
+
 	application = NACT_APPLICATION( base_window_get_application( window ));
 	updater = nact_application_get_updater( application );
 	settings = na_pivot_get_settings( NA_PIVOT( updater ));
-	preferences_locked = na_settings_get_boolean( settings, NA_IPREFS_ADMIN_PREFERENCES_LOCKED, NULL, NULL );
 	write_order = na_settings_get_string_list( settings, NA_IPREFS_IO_PROVIDERS_WRITE_ORDER, NULL, &order_mandatory );
 
-	if( !preferences_locked &&
+	if( !data->preferences_locked &&
 		!order_mandatory &&
 		gtk_tree_selection_get_selected( selection, &model, &iter )){
 
@@ -487,6 +494,7 @@ static void
 on_readable_toggled( GtkCellRendererToggle *renderer, gchar *path_string, BaseWindow *window )
 {
 	static const gchar *thisfn = "nact_providers_list_on_readable_toggled";
+	ProvidersListData *data;
 	GtkTreeView *treeview;
 	GtkTreeModel *model;
 	GtkTreeIter iter;
@@ -508,7 +516,9 @@ on_readable_toggled( GtkCellRendererToggle *renderer, gchar *path_string, BaseWi
 			g_debug( "%s: id=%s, readable=%s (mandatory=%s)", thisfn, id,
 					state ? "True":"False", readable_mandatory ? "True":"False" );
 
-			if( readable_mandatory || are_preferences_locked( window )){
+			data = get_providers_list_data( treeview );
+
+			if( readable_mandatory || data->preferences_locked ){
 				g_signal_handlers_block_by_func(( gpointer ) renderer, on_readable_toggled, window );
 				state = gtk_cell_renderer_toggle_get_active( renderer );
 				gtk_cell_renderer_toggle_set_active( renderer, !state );
@@ -528,6 +538,7 @@ on_writable_toggled( GtkCellRendererToggle *renderer, gchar *path_string, BaseWi
 {
 	static const gchar *thisfn = "nact_providers_list_on_writable_toggled";
 	GtkTreeView *treeview;
+	ProvidersListData *data;
 	GtkTreeModel *model;
 	GtkTreeIter iter;
 	gboolean state;
@@ -548,7 +559,9 @@ on_writable_toggled( GtkCellRendererToggle *renderer, gchar *path_string, BaseWi
 			g_debug( "%s: id=%s, writable=%s (mandatory=%s)", thisfn, id,
 					state ? "True":"False", writable_mandatory ? "True":"False" );
 
-			if( writable_mandatory || are_preferences_locked( window )){
+			data = get_providers_list_data( treeview );
+
+			if( writable_mandatory || data->preferences_locked ){
 				g_signal_handlers_block_by_func(( gpointer ) renderer, on_writable_toggled, window );
 				state = gtk_cell_renderer_toggle_get_active( renderer );
 				gtk_cell_renderer_toggle_set_active( renderer, !state );
@@ -618,24 +631,6 @@ on_down_clicked( GtkButton *button, BaseWindow *window )
 	}
 }
 
-static gboolean
-are_preferences_locked( BaseWindow *window )
-{
-	NactApplication *application;
-	NAUpdater *updater;
-	NASettings *settings;
-	gboolean are_locked;
-
-	g_debug( "nact_providers_list_are_preferences_locked: window=%p (%s)", ( void * ) window, G_OBJECT_TYPE_NAME( window ));
-
-	application = NACT_APPLICATION( base_window_get_application( window ));
-	updater = nact_application_get_updater( application );
-	settings = na_pivot_get_settings( NA_PIVOT( updater ));
-	are_locked = na_settings_get_boolean( settings, NA_IPREFS_ADMIN_PREFERENCES_LOCKED, NULL, NULL );
-
-	return( are_locked );
-}
-
 /*
  * unavailable provider: italic grey
  */
diff --git a/src/nact/nact-schemes-list.c b/src/nact/nact-schemes-list.c
index faf4293..348d06c 100644
--- a/src/nact/nact-schemes-list.c
+++ b/src/nact/nact-schemes-list.c
@@ -105,7 +105,6 @@ static void             display_keyword( GtkTreeViewColumn *column, GtkCellRende
 static void             display_description( GtkTreeViewColumn *column, GtkCellRenderer *cell, GtkTreeModel *model, GtkTreeIter *iter, SchemesListData *data );
 static void             display_label( GtkTreeViewColumn *column, GtkCellRenderer *cell, GtkTreeModel *model, GtkTreeIter *iter, SchemesListData *data, guint column_id );
 
-static gboolean         are_preferences_locked( BaseWindow *window );
 static GtkButton       *get_add_button( BaseWindow *window );
 static GtkButton       *get_remove_button( BaseWindow *window );
 static SchemesListData *get_schemes_list_data( GtkTreeView *treeview );
@@ -204,6 +203,8 @@ nact_schemes_list_init_view( GtkTreeView *treeview, BaseWindow *window, pf_new_s
 {
 	static const gchar *thisfn = "nact_schemes_list_init_view";
 	SchemesListData *data;
+	NactApplication *application;
+	NAUpdater *updater;
 
 	g_debug( "%s: treeview=%p, window=%p",
 			thisfn,
@@ -217,7 +218,9 @@ nact_schemes_list_init_view( GtkTreeView *treeview, BaseWindow *window, pf_new_s
 
 	data = get_schemes_list_data( treeview );
 	data->window = window;
-	data->preferences_locked = are_preferences_locked( window );
+	application = NACT_APPLICATION( base_window_get_application( window ));
+	updater = nact_application_get_updater( application );
+	data->preferences_locked = na_updater_are_preferences_locked( updater );
 	data->editable = ( data->mode == SCHEMES_LIST_FOR_PREFERENCES && !data->preferences_locked );
 	data->pf_on_sel_changed = pf;
 	data->user_data = user_data;
@@ -799,26 +802,6 @@ display_label( GtkTreeViewColumn *column, GtkCellRenderer *cell, GtkTreeModel *m
 	}
 }
 
-static gboolean
-are_preferences_locked( BaseWindow *window )
-{
-	static const gchar *thisfn = "nact_schemes_list_are_preferences_locked";
-	NactApplication *application;
-	NAUpdater *updater;
-	NASettings *settings;
-	gboolean are_locked;
-
-
-	g_debug( "%s: window=%p (%s)", thisfn, ( void * ) window, G_OBJECT_TYPE_NAME( window ));
-
-	application = NACT_APPLICATION( base_window_get_application( window ));
-	updater = nact_application_get_updater( application );
-	settings = na_pivot_get_settings( NA_PIVOT( updater ));
-	are_locked = na_settings_get_boolean( settings, NA_IPREFS_ADMIN_PREFERENCES_LOCKED, NULL, NULL );
-
-	return( are_locked );
-}
-
 static GtkButton *
 get_add_button( BaseWindow *window )
 {