[nautilus-actions] Rename nact-gtk-utils to base-gtk-utils and merge base-iprefs into it

[Pierre Wieser <pwieser src gnome org>]

commit 08b1b0f32d6204e77d1ce9841ee9deae55ea0671
Author: Pierre Wieser <pwieser trychlos org>
Date:   Wed Feb 2 22:12:25 2011 +0100

    Rename nact-gtk-utils to base-gtk-utils and merge base-iprefs into it

 ChangeLog                                       |   29 +++
 src/nact/Makefile.am                            |    6 +-
 src/nact/{nact-gtk-utils.c => base-gtk-utils.c} |  239 ++++++++++++++++---
 src/nact/{nact-gtk-utils.h => base-gtk-utils.h} |   45 ++--
 src/nact/base-iprefs.c                          |  295 -----------------------
 src/nact/base-iprefs.h                          |   75 ------
 src/nact/base-window.c                          |   27 +--
 src/nact/nact-assistant-export.c                |    2 -
 src/nact/nact-export-ask.c                      |    6 +-
 src/nact/nact-export-format.c                   |    6 +-
 src/nact/nact-iaction-tab.c                     |   23 +-
 src/nact/nact-ibasenames-tab.c                  |    4 +-
 src/nact/nact-icommand-tab.c                    |   23 +-
 src/nact/nact-icon-chooser.c                    |    9 +-
 src/nact/nact-ienvironment-tab.c                |   34 ++--
 src/nact/nact-iexecution-tab.c                  |   18 +-
 src/nact/nact-ifolders-tab.c                    |    9 +-
 src/nact/nact-iproperties-tab.c                 |   10 +-
 src/nact/nact-ischemes-tab.c                    |    4 +-
 src/nact/nact-main-statusbar.c                  |    4 +-
 src/nact/nact-main-window.c                     |    5 +-
 src/nact/nact-match-list.c                      |    8 +-
 src/nact/nact-preferences-editor.c              |   44 ++--
 src/nact/nact-providers-list.c                  |    2 +-
 src/nact/nact-schemes-list.c                    |    6 +-
 src/nact/nact-tree-model.c                      |    4 +-
 26 files changed, 370 insertions(+), 567 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index d4ae293..3ddb688 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,34 @@
 2011-02-02 Pierre Wieser <pwieser trychlos org>
 
+	Rename nact-gtk-utils to base-gtk-utils and merge base-iprefs into it
+
+	* src/nact/base-iprefs.c:
+	* src/nact/base-iprefs.c: Removed files.
+
+	* src/nact/Makefile.am:
+	* src/nact/base-gtk-utils.c:
+	* src/nact/base-gtk-utils.h:
+	* src/nact/base-window.c:
+	* src/nact/nact-assistant-export.c:
+	* src/nact/nact-export-ask.c:
+	* src/nact/nact-export-format.c:
+	* src/nact/nact-iaction-tab.c:
+	* src/nact/nact-ibasenames-tab.c:
+	* src/nact/nact-icommand-tab.c:
+	* src/nact/nact-icon-chooser.c:
+	* src/nact/nact-ienvironment-tab.c:
+	* src/nact/nact-iexecution-tab.c:
+	* src/nact/nact-ifolders-tab.c:
+	* src/nact/nact-iproperties-tab.c:
+	* src/nact/nact-ischemes-tab.c:
+	* src/nact/nact-main-statusbar.c:
+	* src/nact/nact-main-window.c:
+	* src/nact/nact-match-list.c:
+	* src/nact/nact-preferences-editor.c:
+	* src/nact/nact-providers-list.c:
+	* src/nact/nact-schemes-list.c:
+	* src/nact/nact-tree-model.c: Updated accordingly.
+
 	Convert the get_wp_id() BaseIPrefsInterface method to "base-window-wsp-name"
 	BaseWindow property
 
diff --git a/src/nact/Makefile.am b/src/nact/Makefile.am
index 345eebd..b5c486f 100644
--- a/src/nact/Makefile.am
+++ b/src/nact/Makefile.am
@@ -56,8 +56,8 @@ nautilus_actions_config_tool_SOURCES = \
 	base-builder.h										\
 	base-dialog.c										\
 	base-dialog.h										\
-	base-iprefs.c										\
-	base-iprefs.h										\
+	base-gtk-utils.c									\
+	base-gtk-utils.h									\
 	base-keysyms.h										\
 	base-window.c										\
 	base-window.h										\
@@ -88,8 +88,6 @@ nautilus_actions_config_tool_SOURCES = \
 	nact-export-ask.h									\
 	nact-export-format.c								\
 	nact-export-format.h								\
-	nact-gtk-utils.c									\
-	nact-gtk-utils.h									\
 	nact-iactions-list.c								\
 	nact-iactions-list.h								\
 	nact-iactions-list-bis.c							\
diff --git a/src/nact/nact-gtk-utils.c b/src/nact/base-gtk-utils.c
similarity index 74%
rename from src/nact/nact-gtk-utils.c
rename to src/nact/base-gtk-utils.c
index 9d134ce..c400392 100644
--- a/src/nact/nact-gtk-utils.c
+++ b/src/nact/base-gtk-utils.c
@@ -32,14 +32,12 @@
 #include <config.h>
 #endif
 
-#include <glib.h>
 #include <string.h>
 
 #include <core/na-iprefs.h>
 #include <core/na-updater.h>
 
-#include "base-iprefs.h"
-#include "nact-gtk-utils.h"
+#include "base-gtk-utils.h"
 #include "nact-application.h"
 
 #define NACT_PROP_TOGGLE_BUTTON				"nact-prop-toggle-button"
@@ -49,10 +47,181 @@
 #define DEFAULT_WIDTH		22
 #define DEFAULT_HEIGHT		22
 
-static GtkWidget *search_for_child_widget( GtkContainer *container, const gchar *name );
+static NASettings *get_settings( const BaseWindow *window );
+static GList      *read_int_list( const BaseWindow *window, const gchar *key );
+static void        write_int_list( const BaseWindow *window, const gchar *key, GList *list );
+static void        int_list_to_position( const BaseWindow *window, GList *list, gint *x, gint *y, gint *width, gint *height );
+static GList      *position_to_int_list( const BaseWindow *window, gint x, gint y, gint width, gint height );
+static void        free_int_list( GList *list );
+
+static GtkWidget  *search_for_child_widget( GtkContainer *container, const gchar *name );
+
+/**
+ * base_gtk_utils_position_window:
+ * @window: this #BaseWindow-derived window.
+ * @wsp_name: the string which handles the window size and position in user preferences.
+ *
+ * Position the specified window on the screen.
+ *
+ * A window position is stored as a list of integers "x,y,width,height".
+ */
+void
+base_gtk_utils_restore_window_position( const BaseWindow *window, const gchar *wsp_name )
+{
+	static const gchar *thisfn = "base_gtk_utils_restore_window_position";
+	GtkWindow *toplevel;
+	GList *list;
+	gint x=0, y=0, width=0, height=0;
+	GdkDisplay *display;
+	GdkScreen *screen;
+	gint screen_width, screen_height;
+
+	g_return_if_fail( BASE_IS_WINDOW( window ));
+	g_return_if_fail( wsp_name && strlen( wsp_name ));
+
+	toplevel = base_window_get_gtk_toplevel( window );
+
+	g_debug( "%s: window=%p (%s), toplevel=%p (%s), wsp_name=%s",
+			thisfn, ( void * ) window, G_OBJECT_TYPE_NAME( window ),
+			( void * ) toplevel, G_OBJECT_TYPE_NAME( toplevel ), wsp_name );
+
+	list = read_int_list( window, wsp_name );
+
+	if( list ){
+		int_list_to_position( window, list, &x, &y, &width, &height );
+		g_debug( "%s: wsp_name=%s, x=%d, y=%d, width=%d, height=%d", thisfn, wsp_name, x, y, width, height );
+		free_int_list( list );
+	}
+
+	if( width > 0 && height > 0 ){
+		display = gdk_display_get_default();
+		screen = gdk_display_get_screen( display, 0 );
+		screen_width = gdk_screen_get_width( screen );
+		screen_height = gdk_screen_get_height( screen );
+
+		if(( x+width < screen_width ) && ( y+height < screen_height )){
+			gtk_window_move( toplevel, x, y );
+			gtk_window_resize( toplevel, width, height );
+		}
+	}
+}
+
+/**
+ * base_gtk_utils_save_window_position:
+ * @window: this #BaseWindow-derived window.
+ * @wsp_name: the string which handles the window size and position in user preferences.
+ *
+ * Save the size and position of the specified window.
+ */
+void
+base_gtk_utils_save_window_position( const BaseWindow *window, const gchar *wsp_name )
+{
+	static const gchar *thisfn = "base_gtk_utils_save_window_position";
+	GtkWindow *toplevel;
+	gint x, y, width, height;
+	GList *list;
+
+	g_return_if_fail( BASE_IS_WINDOW( window ));
+	g_return_if_fail( wsp_name && strlen( wsp_name ));
+
+	toplevel = base_window_get_gtk_toplevel( window );
+	g_return_if_fail( GTK_IS_WINDOW( toplevel ));
+
+	gtk_window_get_position( toplevel, &x, &y );
+	gtk_window_get_size( toplevel, &width, &height );
+	g_debug( "%s: wsp_name=%s, x=%d, y=%d, width=%d, height=%d", thisfn, wsp_name, x, y, width, height );
+
+	list = position_to_int_list( window, x, y, width, height );
+	write_int_list( window, wsp_name, list );
+	free_int_list( list );
+}
+
+/* It seems inevitable that preferences are attached to the application.
+ * Unfortunately, it does not seem possible to have a base window size and
+ * position itself. So, this BaseIPrefs interface is not really a base
+ * interface, but rather a common one, attached to the application
+ */
+static NASettings *
+get_settings( const BaseWindow *window )
+{
+	NactApplication *appli = NACT_APPLICATION( base_window_get_application( window ));
+	NAUpdater *updater = nact_application_get_updater( appli );
+	return( na_pivot_get_settings( NA_PIVOT( updater )));
+}
+
+/*
+ * returns a list of int
+ */
+static GList *
+read_int_list( const BaseWindow *window, const gchar *key )
+{
+	NASettings *settings = get_settings( window );
+	return( na_settings_get_uint_list( settings, key, NULL, NULL ));
+}
+
+static void
+write_int_list( const BaseWindow *window, const gchar *key, GList *list )
+{
+	NASettings *settings = get_settings( window );
+	na_settings_set_uint_list( settings, key, list );
+}
+
+/*
+ * extract the position of the window from the list of unsigned integers
+ */
+static void
+int_list_to_position( const BaseWindow *window, GList *list, gint *x, gint *y, gint *width, gint *height )
+{
+	GList *it;
+	int i;
+
+	g_assert( x );
+	g_assert( y );
+	g_assert( width );
+	g_assert( height );
+
+	for( it=list, i=0 ; it ; it=it->next, i+=1 ){
+		switch( i ){
+			case 0:
+				*x = GPOINTER_TO_UINT( it->data );
+				break;
+			case 1:
+				*y = GPOINTER_TO_UINT( it->data );
+				break;
+			case 2:
+				*width = GPOINTER_TO_UINT( it->data );
+				break;
+			case 3:
+				*height = GPOINTER_TO_UINT( it->data );
+				break;
+		}
+	}
+}
+
+static GList *
+position_to_int_list( const BaseWindow *window, gint x, gint y, gint width, gint height )
+{
+	GList *list = NULL;
+
+	list = g_list_append( list, GUINT_TO_POINTER( x ));
+	list = g_list_append( list, GUINT_TO_POINTER( y ));
+	list = g_list_append( list, GUINT_TO_POINTER( width ));
+	list = g_list_append( list, GUINT_TO_POINTER( height ));
+
+	return( list );
+}
+
+/*
+ * free the list of int
+ */
+static void
+free_int_list( GList *list )
+{
+	g_list_free( list );
+}
 
 /**
- * nact_gtk_utils_set_editable:
+ * base_gtk_utils_set_editable:
  * @widget: the #GtkWdiget.
  * @editable: whether the @widget is editable or not.
  *
@@ -63,7 +232,7 @@ static GtkWidget *search_for_child_widget( GtkContainer *container, const gchar
  * deprecated in Gtk+-3.0)
  */
 void
-nact_gtk_utils_set_editable( GObject *widget, gboolean editable )
+base_gtk_utils_set_editable( GObject *widget, gboolean editable )
 {
 	GList *renderers, *irender;
 
@@ -120,7 +289,7 @@ nact_gtk_utils_set_editable( GObject *widget, gboolean editable )
 }
 
 /**
- * nact_gtk_utils_radio_set_initial_state:
+ * base_gtk_utils_radio_set_initial_state:
  * @button: the #GtkRadioButton button which is initially active.
  * @handler: the corresponding "toggled" handler.
  * @user_data: the user data associated to the handler.
@@ -143,7 +312,7 @@ nact_gtk_utils_set_editable( GObject *widget, gboolean editable )
  * initial state.
  */
 void
-nact_gtk_utils_radio_set_initial_state( GtkRadioButton *button,
+base_gtk_utils_radio_set_initial_state( GtkRadioButton *button,
 		GCallback handler, void *user_data, gboolean editable, gboolean sensitive )
 {
 	GSList *group, *ig;
@@ -157,7 +326,7 @@ nact_gtk_utils_radio_set_initial_state( GtkRadioButton *button,
 		g_object_set_data( G_OBJECT( other ), NACT_PROP_TOGGLE_HANDLER, handler );
 		g_object_set_data( G_OBJECT( other ), NACT_PROP_TOGGLE_USER_DATA, user_data );
 		g_object_set_data( G_OBJECT( other ), NACT_PROP_TOGGLE_EDITABLE, GUINT_TO_POINTER( editable ));
-		nact_gtk_utils_set_editable( G_OBJECT( other ), editable );
+		base_gtk_utils_set_editable( G_OBJECT( other ), editable );
 		gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( other ), FALSE );
 		gtk_widget_set_sensitive( GTK_WIDGET( other ), sensitive );
 	}
@@ -166,7 +335,7 @@ nact_gtk_utils_radio_set_initial_state( GtkRadioButton *button,
 }
 
 /**
- * nact_gtk_utils_radio_reset_initial_state:
+ * base_gtk_utils_radio_reset_initial_state:
  * @button: the #GtkRadioButton being toggled.
  * @handler: the corresponding "toggled" handler.
  * @data: data associated with the @handler callback.
@@ -177,7 +346,7 @@ nact_gtk_utils_radio_set_initial_state( GtkRadioButton *button,
  * editable).
  */
 void
-nact_gtk_utils_radio_reset_initial_state( GtkRadioButton *button, GCallback handler )
+base_gtk_utils_radio_reset_initial_state( GtkRadioButton *button, GCallback handler )
 {
 	GtkToggleButton *initial_button;
 	GCallback initial_handler;
@@ -209,7 +378,7 @@ nact_gtk_utils_radio_reset_initial_state( GtkRadioButton *button, GCallback hand
 }
 
 /**
- * nact_gtk_utils_toggle_set_initial_state:
+ * base_gtk_utils_toggle_set_initial_state:
  * @button: the #GtkToggleButton button.
  * @handler: the corresponding "toggled" handler.
  * @window: the toplevel #BaseWindow which embeds the button;
@@ -229,7 +398,7 @@ nact_gtk_utils_radio_reset_initial_state( GtkRadioButton *button, GCallback hand
  * - explictely triggers the 'toggled' handler
  */
 void
-nact_gtk_utils_toggle_set_initial_state( BaseWindow *window,
+base_gtk_utils_toggle_set_initial_state( BaseWindow *window,
 		const gchar *button_name, GCallback handler,
 		gboolean active, gboolean editable, gboolean sensitive )
 {
@@ -245,7 +414,7 @@ nact_gtk_utils_toggle_set_initial_state( BaseWindow *window,
 		g_object_set_data( G_OBJECT( button ), NACT_PROP_TOGGLE_USER_DATA, window );
 		g_object_set_data( G_OBJECT( button ), NACT_PROP_TOGGLE_EDITABLE, GUINT_TO_POINTER( editable ));
 
-		nact_gtk_utils_set_editable( G_OBJECT( button ), editable );
+		base_gtk_utils_set_editable( G_OBJECT( button ), editable );
 		gtk_widget_set_sensitive( GTK_WIDGET( button ), sensitive );
 		gtk_toggle_button_set_active( button, active );
 
@@ -254,7 +423,7 @@ nact_gtk_utils_toggle_set_initial_state( BaseWindow *window,
 }
 
 /**
- * nact_gtk_utils_toggle_reset_initial_state:
+ * base_gtk_utils_toggle_reset_initial_state:
  * @button: the #GtkToggleButton check button.
  *
  * When clicking on a read-only check button, this function ensures that
@@ -262,7 +431,7 @@ nact_gtk_utils_toggle_set_initial_state( BaseWindow *window,
  * is editable or not (does nothing if button is actually editable).
  */
 void
-nact_gtk_utils_toggle_reset_initial_state( GtkToggleButton *button )
+base_gtk_utils_toggle_reset_initial_state( GtkToggleButton *button )
 {
 	gboolean editable;
 	GCallback handler;
@@ -291,9 +460,9 @@ nact_gtk_utils_toggle_reset_initial_state( GtkToggleButton *button )
  * Returns a pixbuf for the given widget.
  */
 GdkPixbuf *
-nact_gtk_utils_get_pixbuf( const gchar *name, GtkWidget *widget, GtkIconSize size )
+base_gtk_utils_get_pixbuf( const gchar *name, GtkWidget *widget, GtkIconSize size )
 {
-	static const gchar *thisfn = "nact_gtk_utils_get_pixbuf";
+	static const gchar *thisfn = "base_gtk_utils_get_pixbuf";
 	GdkPixbuf* pixbuf;
 	GError *error;
 	gint width, height;
@@ -364,16 +533,16 @@ nact_gtk_utils_get_pixbuf( const gchar *name, GtkWidget *widget, GtkIconSize siz
  * Displays the (maybe themed) image on the given widget.
  */
 void
-nact_gtk_utils_render( const gchar *name, GtkImage *widget, GtkIconSize size )
+base_gtk_utils_render( const gchar *name, GtkImage *widget, GtkIconSize size )
 {
-	static const gchar *thisfn = "nact_gtk_utils_render";
+	static const gchar *thisfn = "base_gtk_utils_render";
 	GdkPixbuf* pixbuf;
 	gint width, height;
 
 	g_debug( "%s: name=%s, widget=%p, size=%d", thisfn, name, ( void * ) widget, size );
 
 	if( name ){
-		pixbuf = nact_gtk_utils_get_pixbuf( name, GTK_WIDGET( widget ), size );
+		pixbuf = base_gtk_utils_get_pixbuf( name, GTK_WIDGET( widget ), size );
 
 	} else {
 		if( !gtk_icon_size_lookup( size, &width, &height )){
@@ -390,7 +559,7 @@ nact_gtk_utils_render( const gchar *name, GtkImage *widget, GtkIconSize size )
 }
 
 /**
- * nact_gtk_utils_select_file:
+ * base_gtk_utils_select_file:
  * @window: the #BaseWindow which will be the parent of the dialog box.
  * @title: the title of the dialog box.
  * @wsp_name: the name of the dialog box in Preferences to read/write
@@ -407,16 +576,16 @@ nact_gtk_utils_render( const gchar *name, GtkImage *widget, GtkIconSize size )
  * URI will be written as @entry_name in Preferences.
  */
 void
-nact_gtk_utils_select_file( BaseWindow *window,
+base_gtk_utils_select_file( BaseWindow *window,
 				const gchar *title, const gchar *wsp_name,
 				GtkWidget *entry, const gchar *entry_name )
 {
-	nact_gtk_utils_select_file_with_preview(
+	base_gtk_utils_select_file_with_preview(
 			window, title, wsp_name, entry, entry_name, NULL );
 }
 
 /**
- * nact_gtk_utils_select_file_with_preview:
+ * base_gtk_utils_select_file_with_preview:
  * @window: the #BaseWindow which will be the parent of the dialog box.
  * @title: the title of the dialog box.
  * @wsp_name: the name of the dialog box in Preferences to read/write
@@ -435,7 +604,7 @@ nact_gtk_utils_select_file( BaseWindow *window,
  * URI will be written as @entry_name in Preferences.
  */
 void
-nact_gtk_utils_select_file_with_preview( BaseWindow *window,
+base_gtk_utils_select_file_with_preview( BaseWindow *window,
 				const gchar *title, const gchar *wsp_name,
 				GtkWidget *entry, const gchar *entry_name,
 				GCallback update_preview_cb )
@@ -469,7 +638,7 @@ nact_gtk_utils_select_file_with_preview( BaseWindow *window,
 		g_signal_connect( dialog, "update-preview", update_preview_cb, preview );
 	}
 
-	base_iprefs_restore_window_position( window, wsp_name );
+	base_gtk_utils_restore_window_position( window, wsp_name );
 
 	text = gtk_entry_get_text( GTK_ENTRY( entry ));
 
@@ -494,13 +663,13 @@ nact_gtk_utils_select_file_with_preview( BaseWindow *window,
 	na_settings_set_string( settings, entry_name, uri );
 	g_free( uri );
 
-	base_iprefs_save_window_position( window, wsp_name );
+	base_gtk_utils_save_window_position( window, wsp_name );
 
 	gtk_widget_destroy( dialog );
 }
 
 /**
- * nact_gtk_utils_select_dir:
+ * base_gtk_utils_select_dir:
  * @window: the #BaseWindow which will be the parent of the dialog box.
  * @title: the title of the dialog box.
  * @wsp_name: the name of the dialog box in Preferences to read/write
@@ -519,7 +688,7 @@ nact_gtk_utils_select_file_with_preview( BaseWindow *window,
  * URI will be written as @entry_name in Preferences.
  */
 void
-nact_gtk_utils_select_dir( BaseWindow *window,
+base_gtk_utils_select_dir( BaseWindow *window,
 				const gchar *title, const gchar *wsp_name,
 				GtkWidget *entry, const gchar *entry_name )
 {
@@ -545,7 +714,7 @@ nact_gtk_utils_select_dir( BaseWindow *window,
 			NULL
 			);
 
-	base_iprefs_restore_window_position( window, wsp_name );
+	base_gtk_utils_restore_window_position( window, wsp_name );
 
 	text = gtk_entry_get_text( GTK_ENTRY( entry ));
 
@@ -570,13 +739,13 @@ nact_gtk_utils_select_dir( BaseWindow *window,
 	na_settings_set_string( settings, entry_name, uri );
 	g_free( uri );
 
-	base_iprefs_save_window_position( window, wsp_name );
+	base_gtk_utils_save_window_position( window, wsp_name );
 
 	gtk_widget_destroy( dialog );
 }
 
 /**
- * nact_gtk_utils_get_widget_by_name:
+ * base_gtk_utils_get_widget_by_name:
  * @toplevel: the #GtkWindow toplevel.
  * @name: the name of the searched child.
  *
@@ -585,9 +754,9 @@ nact_gtk_utils_select_dir( BaseWindow *window,
  * should not be released by the caller.
  */
 GtkWidget *
-nact_gtk_utils_get_widget_by_name( GtkWindow *toplevel, const gchar *name )
+base_gtk_utils_get_widget_by_name( GtkWindow *toplevel, const gchar *name )
 {
-	static const gchar *thisfn = "nact_gtk_utils_get_widget_by_name";
+	static const gchar *thisfn = "base_gtk_utils_get_widget_by_name";
 	GtkWidget *widget = NULL;
 
 	g_return_val_if_fail( GTK_IS_WINDOW( toplevel ), NULL );
diff --git a/src/nact/nact-gtk-utils.h b/src/nact/base-gtk-utils.h
similarity index 61%
rename from src/nact/nact-gtk-utils.h
rename to src/nact/base-gtk-utils.h
index e0a3fb4..7bd8e53 100644
--- a/src/nact/nact-gtk-utils.h
+++ b/src/nact/base-gtk-utils.h
@@ -28,60 +28,65 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __NACT_GTK_UTILS_H__
-#define __NACT_GTK_UTILS_H__
+#ifndef __BASE_GTK_UTILS_H__
+#define __BASE_GTK_UTILS_H__
 
 /**
- * SECTION: nact-gtk-utils
- * @title: NactGtkUtils
+ * SECTION: base-gtk-utils
+ * @title: BaseGtkUtils
  * @short_description: Gtk helper functions
- * @include: nact-gtk-utils.h
+ * @include: base-gtk-utils.h
  */
 
 #include "base-window.h"
 
 G_BEGIN_DECLS
 
+/* window size and position
+ */
+void       base_gtk_utils_restore_window_position( const BaseWindow *window, const gchar *wsp_name );
+void       base_gtk_utils_save_window_position   ( const BaseWindow *window, const gchar *wsp_name );
+
 #define NACT_PROP_TOGGLE_EDITABLE			"nact-prop-toggle-editable"
 
-void       nact_gtk_utils_set_editable( GObject *widget, gboolean editable );
+void       base_gtk_utils_set_editable( GObject *widget, gboolean editable );
 
-void       nact_gtk_utils_radio_set_initial_state  ( GtkRadioButton *button,
+void       base_gtk_utils_radio_set_initial_state  ( GtkRadioButton *button,
 				GCallback toggled_handler, void *user_data,
 				gboolean editable, gboolean sensitive );
 
-void       nact_gtk_utils_radio_reset_initial_state( GtkRadioButton *button, GCallback toggled_handler );
+void       base_gtk_utils_radio_reset_initial_state( GtkRadioButton *button, GCallback toggled_handler );
 
-void       nact_gtk_utils_toggle_set_initial_state  ( BaseWindow *window,
+void       base_gtk_utils_toggle_set_initial_state ( BaseWindow *window,
 				const gchar *button_name, GCallback toggled_handler,
 				gboolean active, gboolean editable, gboolean sensitive );
 
-void       nact_gtk_utils_toggle_reset_initial_state( GtkToggleButton *button );
+void       base_gtk_utils_toggle_reset_initial_state( GtkToggleButton *button );
 
 /* image utilities
  */
-GdkPixbuf *nact_gtk_utils_get_pixbuf( const gchar *name, GtkWidget *widget, GtkIconSize size );
-void       nact_gtk_utils_render( const gchar *name, GtkImage *widget, GtkIconSize size );
+GdkPixbuf *base_gtk_utils_get_pixbuf( const gchar *name, GtkWidget *widget, GtkIconSize size );
+void       base_gtk_utils_render( const gchar *name, GtkImage *widget, GtkIconSize size );
 
 /* standard dialog boxes
  */
-void       nact_gtk_utils_select_file( BaseWindow *window,
-				const gchar *title, const gchar *dialog_name,
+void       base_gtk_utils_select_file( BaseWindow *window,
+				const gchar *title, const gchar *wsp_name,
 				GtkWidget *entry, const gchar *entry_name );
 
-void       nact_gtk_utils_select_file_with_preview( BaseWindow *window,
-				const gchar *title, const gchar *dialog_name,
+void       base_gtk_utils_select_file_with_preview( BaseWindow *window,
+				const gchar *title, const gchar *wsp_name,
 				GtkWidget *entry, const gchar *entry_name,
 				GCallback update_preview_cb );
 
-void       nact_gtk_utils_select_dir( BaseWindow *window,
-				const gchar *title, const gchar *dialog_name,
+void       base_gtk_utils_select_dir( BaseWindow *window,
+				const gchar *title, const gchar *wsp_name,
 				GtkWidget *entry, const gchar *entry_name );
 
 /* GtkWidget
  */
-GtkWidget *nact_gtk_utils_get_widget_by_name( GtkWindow *toplevel, const gchar *name );
+GtkWidget *base_gtk_utils_get_widget_by_name( GtkWindow *toplevel, const gchar *name );
 
 G_END_DECLS
 
-#endif /* __NACT_GTK_UTILS_H__ */
+#endif /* __BASE_GTK_UTILS_H__ */
diff --git a/src/nact/base-window.c b/src/nact/base-window.c
index c4999dd..5367da5 100644
--- a/src/nact/base-window.c
+++ b/src/nact/base-window.c
@@ -32,15 +32,13 @@
 #include <config.h>
 #endif
 
-#include <glib.h>
 #include <glib/gi18n.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "base-application.h"
-#include "base-iprefs.h"
 #include "base-window.h"
-#include "nact-gtk-utils.h"
+#include "base-gtk-utils.h"
 
 /* private class data
  */
@@ -109,7 +107,6 @@ static BaseWindow   *st_first_window           = NULL;
 
 static GType    register_type( void );
 static void     class_init( BaseWindowClass *klass );
-static void     iprefs_base_iface_init( BaseIPrefsInterface *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 );
@@ -167,18 +164,10 @@ register_type( void )
 		( GInstanceInitFunc ) instance_init
 	};
 
-	static const GInterfaceInfo iprefs_base_iface_info = {
-		( GInterfaceInitFunc ) iprefs_base_iface_init,
-		NULL,
-		NULL
-	};
-
 	g_debug( "%s", thisfn );
 
 	type = g_type_register_static( G_TYPE_OBJECT, "BaseWindow", &info, 0 );
 
-	g_type_add_interface_static( type, BASE_IPREFS_TYPE, &iprefs_base_iface_info );
-
 	return( type );
 }
 
@@ -316,14 +305,6 @@ class_init( BaseWindowClass *klass )
 }
 
 static void
-iprefs_base_iface_init( BaseIPrefsInterface *iface )
-{
-	static const gchar *thisfn = "base_window_iprefs_base_iface_init";
-
-	g_debug( "%s: iface=%p", thisfn, ( void * ) iface );
-}
-
-static void
 instance_init( GTypeInstance *instance, gpointer klass )
 {
 	static const gchar *thisfn = "base_window_instance_init";
@@ -451,7 +432,7 @@ instance_dispose( GObject *window )
 
 		g_debug( "%s: window=%p (%s)", thisfn, ( void * ) window, G_OBJECT_TYPE_NAME( window ));
 
-		base_iprefs_save_window_position( self, self->private->wsp_name );
+		base_gtk_utils_save_window_position( self, self->private->wsp_name );
 
 		/* signals must be deconnected before quitting main loop
 		 */
@@ -813,7 +794,7 @@ do_initialize_base_window( BaseWindow *window )
 
 	if( !window->private->dispose_has_run ){
 
-		base_iprefs_restore_window_position( window, window->private->wsp_name );
+		base_gtk_utils_restore_window_position( window, window->private->wsp_name );
 	}
 }
 
@@ -1021,7 +1002,7 @@ base_window_get_widget( const BaseWindow *window, const gchar *name )
 
 	if( !window->private->dispose_has_run ){
 
-		widget = nact_gtk_utils_get_widget_by_name( window->private->gtk_toplevel, name );
+		widget = base_gtk_utils_get_widget_by_name( window->private->gtk_toplevel, name );
 	}
 
 	return( widget );
diff --git a/src/nact/nact-assistant-export.c b/src/nact/nact-assistant-export.c
index 41f580a..880b200 100644
--- a/src/nact/nact-assistant-export.c
+++ b/src/nact/nact-assistant-export.c
@@ -33,7 +33,6 @@
 #endif
 
 #include <glib/gi18n.h>
-#include <gtk/gtk.h>
 #include <string.h>
 
 #include <api/na-core-utils.h>
@@ -42,7 +41,6 @@
 #include <core/na-iprefs.h>
 #include <core/na-exporter.h>
 
-#include "base-iprefs.h"
 #include "nact-application.h"
 #include "nact-main-window.h"
 #include "nact-assistant-export.h"
diff --git a/src/nact/nact-export-ask.c b/src/nact/nact-export-ask.c
index c3d45ff..50b433f 100644
--- a/src/nact/nact-export-ask.c
+++ b/src/nact/nact-export-ask.c
@@ -42,7 +42,7 @@
 #include "nact-application.h"
 #include "nact-export-format.h"
 #include "nact-export-ask.h"
-#include "nact-gtk-utils.h"
+#include "base-gtk-utils.h"
 
 /* private class data
  */
@@ -331,7 +331,7 @@ on_base_initialize_base_window( NactExportAsk *editor )
 		container = base_window_get_widget( BASE_WINDOW( editor ), "ExportFormatAskVBox" );
 		nact_export_format_select( container, !editor->private->format_mandatory, editor->private->format );
 
-		nact_gtk_utils_toggle_set_initial_state( BASE_WINDOW( editor ),
+		base_gtk_utils_toggle_set_initial_state( BASE_WINDOW( editor ),
 				"AskKeepChoiceButton", G_CALLBACK( keep_choice_on_toggled ),
 				editor->private->keep_last_choice,
 				!editor->private->keep_last_choice_mandatory, !editor->private->preferences_locked );
@@ -355,7 +355,7 @@ keep_choice_on_toggled( GtkToggleButton *button, NactExportAsk *editor )
 		editor->private->keep_last_choice = gtk_toggle_button_get_active( button );
 
 	} else {
-		nact_gtk_utils_toggle_reset_initial_state( button );
+		base_gtk_utils_toggle_reset_initial_state( button );
 	}
 }
 
diff --git a/src/nact/nact-export-format.c b/src/nact/nact-export-format.c
index 8887494..f58b74c 100644
--- a/src/nact/nact-export-format.c
+++ b/src/nact/nact-export-format.c
@@ -38,7 +38,7 @@
 #include <core/na-export-format.h>
 
 #include "nact-export-format.h"
-#include "nact-gtk-utils.h"
+#include "base-gtk-utils.h"
 
 typedef struct {
 	GtkWidget      *container_vbox;
@@ -271,7 +271,7 @@ select_default_iter( GtkWidget *vbox, void *quark_ptr )
 	}
 
 	if( button ){
-		nact_gtk_utils_radio_set_initial_state( button,
+		base_gtk_utils_radio_set_initial_state( button,
 				G_CALLBACK( export_format_on_toggled ), vbox_data, editable, sensitive );
 	}
 }
@@ -292,7 +292,7 @@ export_format_on_toggled( GtkToggleButton *toggle_button, VBoxData *vbox_data )
 			g_object_set_data( G_OBJECT( vbox_data->container_vbox ), EXPORT_FORMAT_PROP_CONTAINER_FORMAT, GUINT_TO_POINTER( format ));
 		}
 	} else {
-		nact_gtk_utils_radio_reset_initial_state( GTK_RADIO_BUTTON( toggle_button ), NULL );
+		base_gtk_utils_radio_reset_initial_state( GTK_RADIO_BUTTON( toggle_button ), NULL );
 	}
 }
 
diff --git a/src/nact/nact-iaction-tab.c b/src/nact/nact-iaction-tab.c
index 485b14c..b13cdca 100644
--- a/src/nact/nact-iaction-tab.c
+++ b/src/nact/nact-iaction-tab.c
@@ -40,11 +40,10 @@
 
 #include <core/na-io-provider.h>
 
-#include "base-iprefs.h"
 #include "base-window.h"
 #include "nact-application.h"
 #include "nact-main-statusbar.h"
-#include "nact-gtk-utils.h"
+#include "base-gtk-utils.h"
 #include "nact-iactions-list.h"
 #include "nact-main-tab.h"
 #include "nact-iaction-tab.h"
@@ -419,12 +418,12 @@ on_tab_updatable_selection_changed( NactIActionTab *instance, gint count_selecte
 		toggle = GTK_TOGGLE_BUTTON( base_window_get_widget( BASE_WINDOW( instance ), "ActionTargetSelectionButton" ));
 		gtk_toggle_button_set_active( toggle, target_selection || ( item && NA_IS_OBJECT_MENU( item )));
 		gtk_widget_set_sensitive( GTK_WIDGET( toggle ), item && NA_IS_OBJECT_ACTION( item ));
-		nact_gtk_utils_set_editable( G_OBJECT( toggle ), editable );
+		base_gtk_utils_set_editable( G_OBJECT( toggle ), editable );
 
 		toggle = GTK_TOGGLE_BUTTON( base_window_get_widget( BASE_WINDOW( instance ), "ActionTargetLocationButton" ));
 		gtk_toggle_button_set_active( toggle, target_location || ( item && NA_IS_OBJECT_MENU( item )));
 		gtk_widget_set_sensitive( GTK_WIDGET( toggle ), item && NA_IS_OBJECT_ACTION( item ));
-		nact_gtk_utils_set_editable( G_OBJECT( toggle ), editable );
+		base_gtk_utils_set_editable( G_OBJECT( toggle ), editable );
 
 		enable_label = target_selection || target_location || ( item && NA_IS_OBJECT_MENU( item ));
 		label_widget = base_window_get_widget( BASE_WINDOW( instance ), "ActionMenuLabelEntry" );
@@ -436,25 +435,25 @@ on_tab_updatable_selection_changed( NactIActionTab *instance, gint count_selecte
 		}
 		g_free( label );
 		gtk_widget_set_sensitive( label_widget, enable_label );
-		nact_gtk_utils_set_editable( G_OBJECT( label_widget ), editable );
+		base_gtk_utils_set_editable( G_OBJECT( label_widget ), editable );
 
 		toggle = GTK_TOGGLE_BUTTON( base_window_get_widget( BASE_WINDOW( instance ), "ActionTargetToolbarButton" ));
 		gtk_toggle_button_set_active( toggle, target_toolbar );
 		gtk_widget_set_sensitive( GTK_WIDGET( toggle ), item && NA_IS_OBJECT_ACTION( item ));
-		nact_gtk_utils_set_editable( G_OBJECT( toggle ), editable );
+		base_gtk_utils_set_editable( G_OBJECT( toggle ), editable );
 
 		toggle = GTK_TOGGLE_BUTTON( base_window_get_widget( BASE_WINDOW( instance ), "ToolbarSameLabelButton" ));
 		same_label = item && NA_IS_OBJECT_ACTION( item ) ? na_object_is_toolbar_same_label( item ) : FALSE;
 		gtk_toggle_button_set_active( toggle, same_label );
 		gtk_widget_set_sensitive( GTK_WIDGET( toggle ), target_toolbar );
-		nact_gtk_utils_set_editable( G_OBJECT( toggle ), editable );
+		base_gtk_utils_set_editable( G_OBJECT( toggle ), editable );
 
 		label_widget = base_window_get_widget( BASE_WINDOW( instance ), "ActionToolbarLabelEntry" );
 		label = item && NA_IS_OBJECT_ACTION( item ) ? na_object_get_toolbar_label( item ) : g_strdup( "" );
 		gtk_entry_set_text( GTK_ENTRY( label_widget ), label );
 		g_free( label );
 		gtk_widget_set_sensitive( label_widget, target_toolbar && !same_label );
-		nact_gtk_utils_set_editable( G_OBJECT( label_widget ), editable );
+		base_gtk_utils_set_editable( G_OBJECT( label_widget ), editable );
 
 		label_widget = base_window_get_widget( BASE_WINDOW( instance ), "ActionToolbarLabelLabel" );
 		gtk_widget_set_sensitive( label_widget, target_toolbar && !same_label );
@@ -464,17 +463,17 @@ on_tab_updatable_selection_changed( NactIActionTab *instance, gint count_selecte
 		tooltip = tooltip ? tooltip : g_strdup( "" );
 		gtk_entry_set_text( GTK_ENTRY( tooltip_widget ), tooltip );
 		g_free( tooltip );
-		nact_gtk_utils_set_editable( G_OBJECT( tooltip_widget ), editable );
+		base_gtk_utils_set_editable( G_OBJECT( tooltip_widget ), editable );
 
 		icon_widget = base_window_get_widget( BASE_WINDOW( instance ), "ActionIconEntry" );
 		icon = item ? na_object_get_icon( item ) : g_strdup( "" );
 		icon = icon ? icon : g_strdup( "" );
 		gtk_entry_set_text( GTK_ENTRY( icon_widget ), icon );
 		g_free( icon );
-		nact_gtk_utils_set_editable( G_OBJECT( icon_widget ), editable );
+		base_gtk_utils_set_editable( G_OBJECT( icon_widget ), editable );
 
 		icon_button = GTK_BUTTON( base_window_get_widget( BASE_WINDOW( instance ), "ActionIconBrowseButton" ));
-		nact_gtk_utils_set_editable( G_OBJECT( icon_button ), editable );
+		base_gtk_utils_set_editable( G_OBJECT( icon_button ), editable );
 
 		st_on_selection_change = FALSE;
 	}
@@ -857,5 +856,5 @@ on_icon_changed( GtkEntry *icon_entry, NactIActionTab *instance )
 	 * in such a case, we blank the image
 	 */
 	image = GTK_IMAGE( base_window_get_widget( BASE_WINDOW( instance ), "ActionIconImage" ));
-	nact_gtk_utils_render( icon_name, image, GTK_ICON_SIZE_SMALL_TOOLBAR );
+	base_gtk_utils_render( icon_name, image, GTK_ICON_SIZE_SMALL_TOOLBAR );
 }
diff --git a/src/nact/nact-ibasenames-tab.c b/src/nact/nact-ibasenames-tab.c
index 7da8b1c..b45c1c2 100644
--- a/src/nact/nact-ibasenames-tab.c
+++ b/src/nact/nact-ibasenames-tab.c
@@ -37,7 +37,7 @@
 #include <api/na-object-api.h>
 
 #include "nact-main-tab.h"
-#include "nact-gtk-utils.h"
+#include "base-gtk-utils.h"
 #include "nact-match-list.h"
 #include "nact-ibasenames-tab.h"
 
@@ -256,7 +256,7 @@ on_tab_updatable_selection_changed( BaseWindow *window, gint count_selected )
 		matchcase_button = GTK_TOGGLE_BUTTON( base_window_get_widget( window, "BasenamesMatchcaseButton" ));
 		matchcase = context ? na_object_get_matchcase( context ) : FALSE;
 		gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( matchcase_button ), matchcase );
-		nact_gtk_utils_set_editable( G_OBJECT( matchcase_button ), editable );
+		base_gtk_utils_set_editable( G_OBJECT( matchcase_button ), editable );
 
 		st_on_selection_change = FALSE;
 	}
diff --git a/src/nact/nact-icommand-tab.c b/src/nact/nact-icommand-tab.c
index aad7558..d9e27f0 100644
--- a/src/nact/nact-icommand-tab.c
+++ b/src/nact/nact-icommand-tab.c
@@ -43,10 +43,9 @@
 #include <core/na-tokens.h>
 
 #include "base-window.h"
-#include "base-iprefs.h"
 #include "nact-application.h"
 #include "nact-main-statusbar.h"
-#include "nact-gtk-utils.h"
+#include "base-gtk-utils.h"
 #include "nact-iactions-list.h"
 #include "nact-main-tab.h"
 #include "nact-icommand-tab.h"
@@ -373,7 +372,7 @@ on_tab_updatable_selection_changed( NactICommandTab *instance, gint count_select
 		gtk_entry_set_text( GTK_ENTRY( label_entry ), label );
 		g_free( label );
 		gtk_widget_set_sensitive( label_entry, profile != NULL );
-		nact_gtk_utils_set_editable( G_OBJECT( label_entry ), editable );
+		base_gtk_utils_set_editable( G_OBJECT( label_entry ), editable );
 
 		path_entry = get_path_entry( instance );
 		path = profile ? na_object_get_path( profile ) : g_strdup( "" );
@@ -381,11 +380,11 @@ on_tab_updatable_selection_changed( NactICommandTab *instance, gint count_select
 		gtk_entry_set_text( GTK_ENTRY( path_entry ), path );
 		g_free( path );
 		gtk_widget_set_sensitive( path_entry, profile != NULL );
-		nact_gtk_utils_set_editable( G_OBJECT( path_entry ), editable );
+		base_gtk_utils_set_editable( G_OBJECT( path_entry ), editable );
 
 		path_button = get_path_button( instance );
 		gtk_widget_set_sensitive( GTK_WIDGET( path_button ), profile != NULL );
-		nact_gtk_utils_set_editable( G_OBJECT( path_button ), editable );
+		base_gtk_utils_set_editable( G_OBJECT( path_button ), editable );
 
 		parameters_entry = get_parameters_entry( instance );
 		parameters = profile ? na_object_get_parameters( profile ) : g_strdup( "" );
@@ -393,7 +392,7 @@ on_tab_updatable_selection_changed( NactICommandTab *instance, gint count_select
 		gtk_entry_set_text( GTK_ENTRY( parameters_entry ), parameters );
 		g_free( parameters );
 		gtk_widget_set_sensitive( parameters_entry, profile != NULL );
-		nact_gtk_utils_set_editable( G_OBJECT( parameters_entry ), editable );
+		base_gtk_utils_set_editable( G_OBJECT( parameters_entry ), editable );
 
 		legend_button = get_legend_button( instance );
 		gtk_widget_set_sensitive( GTK_WIDGET( legend_button ), profile != NULL );
@@ -406,11 +405,11 @@ on_tab_updatable_selection_changed( NactICommandTab *instance, gint count_select
 		gtk_entry_set_text( GTK_ENTRY( wdir_entry ), wdir );
 		g_free( wdir );
 		gtk_widget_set_sensitive( wdir_entry, profile != NULL );
-		nact_gtk_utils_set_editable( G_OBJECT( wdir_entry ), editable );
+		base_gtk_utils_set_editable( G_OBJECT( wdir_entry ), editable );
 
 		wdir_button = GTK_BUTTON( base_window_get_widget( BASE_WINDOW( instance ), "CommandWorkingDirectoryButton" ));
 		gtk_widget_set_sensitive( GTK_WIDGET( wdir_button ), profile != NULL );
-		nact_gtk_utils_set_editable( G_OBJECT( wdir_button ), editable );
+		base_gtk_utils_set_editable( G_OBJECT( wdir_button ), editable );
 
 		st_on_selection_change = FALSE;
 	}
@@ -465,7 +464,7 @@ legend_dialog_hide( NactICommandTab *instance )
 
 	if( is_visible ){
 		g_return_if_fail( GTK_IS_WINDOW( legend_dialog ));
-		base_iprefs_save_window_position( BASE_WINDOW( instance ), NA_IPREFS_COMMAND_LEGEND_WSP );
+		base_gtk_utils_save_window_position( BASE_WINDOW( instance ), NA_IPREFS_COMMAND_LEGEND_WSP );
 		gtk_widget_hide( GTK_WIDGET( legend_dialog ));
 
 		/* set the legend button state consistent for when the dialog is
@@ -490,7 +489,7 @@ legend_dialog_show( NactICommandTab *instance )
 	toplevel = base_window_get_gtk_toplevel( BASE_WINDOW( instance ));
 	gtk_window_set_transient_for( GTK_WINDOW( legend_dialog ), toplevel );
 
-	base_iprefs_restore_window_position( BASE_WINDOW( instance ), NA_IPREFS_COMMAND_LEGEND_WSP );
+	base_gtk_utils_restore_window_position( BASE_WINDOW( instance ), NA_IPREFS_COMMAND_LEGEND_WSP );
 	gtk_widget_show( GTK_WIDGET( legend_dialog ));
 
 	g_object_set_data( G_OBJECT( legend_dialog ), ICOMMAND_TAB_LEGEND_VISIBLE, GINT_TO_POINTER( TRUE ));
@@ -557,7 +556,7 @@ on_parameters_changed( GtkEntry *entry, NactICommandTab *instance )
 static void
 on_path_browse( GtkButton *button, NactICommandTab *instance )
 {
-	nact_gtk_utils_select_file(
+	base_gtk_utils_select_file(
 			BASE_WINDOW( instance ),
 			_( "Choosing a command" ), NA_IPREFS_COMMAND_CHOOSER_WSP,
 			get_path_entry( instance ), NA_IPREFS_COMMAND_CHOOSER_URI );
@@ -595,7 +594,7 @@ on_wdir_browse( GtkButton *button, NactICommandTab *instance )
 
 	if( profile ){
 		wdir_entry = base_window_get_widget( BASE_WINDOW( instance ), "WorkingDirectoryEntry" );
-		nact_gtk_utils_select_dir(
+		base_gtk_utils_select_dir(
 				BASE_WINDOW( instance ), _( "Choosing a working directory" ),
 				NA_IPREFS_WORKING_DIR_WSP, wdir_entry, NA_IPREFS_WORKING_DIR_URI );
 	}
diff --git a/src/nact/nact-icon-chooser.c b/src/nact/nact-icon-chooser.c
index 8f895ac..061e59a 100644
--- a/src/nact/nact-icon-chooser.c
+++ b/src/nact/nact-icon-chooser.c
@@ -33,9 +33,8 @@
 #endif
 
 #include "base-keysyms.h"
-#include "base-iprefs.h"
 #include "nact-application.h"
-#include "nact-gtk-utils.h"
+#include "base-gtk-utils.h"
 #include "nact-icon-chooser.h"
 
 /* private class data
@@ -587,7 +586,7 @@ on_current_icon_changed( const NactIconChooser *editor )
 	GtkLabel *label;
 
 	image = GTK_IMAGE( base_window_get_widget( BASE_WINDOW( editor ), "IconImage" ));
-	nact_gtk_utils_render( editor->private->current_icon, image, CURRENT_ICON_SIZE );
+	base_gtk_utils_render( editor->private->current_icon, image, CURRENT_ICON_SIZE );
 
 	if( editor->private->current_icon ){
 		if( g_path_is_absolute( editor->private->current_icon )){
@@ -615,7 +614,7 @@ on_destroy( GtkWidget *widget, GdkEvent *event, void *foo )
 
 	/* clear the various models
 	 */
-	context_view = GTK_TREE_VIEW( nact_gtk_utils_get_widget_by_name( GTK_WINDOW( widget ), "ThemedTreeView" ));
+	context_view = GTK_TREE_VIEW( base_gtk_utils_get_widget_by_name( GTK_WINDOW( widget ), "ThemedTreeView" ));
 	context_store = GTK_LIST_STORE( gtk_tree_view_get_model( context_view ));
 
 	if( gtk_tree_model_get_iter_first( GTK_TREE_MODEL( context_store ), &context_iter )){
@@ -749,7 +748,7 @@ on_themed_icon_changed( GtkIconView *icon_view, NactIconChooser *editor )
 					-1 );
 
 			preview_image = base_window_get_widget( BASE_WINDOW( editor ), "ThemedIconImage" );
-			nact_gtk_utils_render( label, GTK_IMAGE( preview_image ), PREVIEW_ICON_SIZE );
+			base_gtk_utils_render( label, GTK_IMAGE( preview_image ), PREVIEW_ICON_SIZE );
 			preview_label = base_window_get_widget( BASE_WINDOW( editor ), "ThemedIconName" );
 			gtk_label_set_text( GTK_LABEL( preview_label ), label );
 
diff --git a/src/nact/nact-ienvironment-tab.c b/src/nact/nact-ienvironment-tab.c
index 224e7f4..fa8de68 100644
--- a/src/nact/nact-ienvironment-tab.c
+++ b/src/nact/nact-ienvironment-tab.c
@@ -42,7 +42,7 @@
 
 #include <core/na-settings.h>
 
-#include "nact-gtk-utils.h"
+#include "base-gtk-utils.h"
 #include "nact-main-tab.h"
 #include "nact-ienvironment-tab.h"
 
@@ -380,10 +380,10 @@ on_tab_updatable_selection_changed( NactIEnvironmentTab *instance, gint count_se
 		g_free( sel_count );
 
 		combo = base_window_get_widget( BASE_WINDOW( instance ), "SelectionCountSigneCombobox" );
-		nact_gtk_utils_set_editable( G_OBJECT( combo ), editable );
+		base_gtk_utils_set_editable( G_OBJECT( combo ), editable );
 
 		entry = base_window_get_widget( BASE_WINDOW( instance ), "SelectionCountNumberEntry" );
-		nact_gtk_utils_set_editable( G_OBJECT( entry ), editable );
+		base_gtk_utils_set_editable( G_OBJECT( entry ), editable );
 
 		/* desktop environment
 		 */
@@ -398,7 +398,7 @@ on_tab_updatable_selection_changed( NactIEnvironmentTab *instance, gint count_se
 		gtk_toggle_button_set_inconsistent( GTK_TOGGLE_BUTTON( always_button ), context == NULL );
 
 		if( desktops && g_slist_length( desktops )){
-			nact_gtk_utils_radio_set_initial_state(
+			base_gtk_utils_radio_set_initial_state(
 					GTK_RADIO_BUTTON( show_button ),
 					G_CALLBACK( on_only_show_toggled ), instance, editable, ( context != NULL ));
 			gtk_widget_set_sensitive( GTK_WIDGET( listview ), TRUE );
@@ -407,13 +407,13 @@ on_tab_updatable_selection_changed( NactIEnvironmentTab *instance, gint count_se
 			desktops = context ? na_object_get_not_show_in( context ) : NULL;
 
 			if( desktops && g_slist_length( desktops )){
-				nact_gtk_utils_radio_set_initial_state(
+				base_gtk_utils_radio_set_initial_state(
 						GTK_RADIO_BUTTON( notshow_button ),
 						G_CALLBACK( on_do_not_show_toggled ), instance, editable, ( context != NULL ));
 				gtk_widget_set_sensitive( GTK_WIDGET( listview ), TRUE );
 
 			} else {
-				nact_gtk_utils_radio_set_initial_state(
+				base_gtk_utils_radio_set_initial_state(
 						GTK_RADIO_BUTTON( always_button ),
 						G_CALLBACK( on_show_always_toggled ), instance, editable, ( context != NULL ));
 				gtk_widget_set_sensitive( GTK_WIDGET( listview ), FALSE );
@@ -430,34 +430,34 @@ on_tab_updatable_selection_changed( NactIEnvironmentTab *instance, gint count_se
 		text = text && strlen( text ) ? text : g_strdup( "" );
 		gtk_entry_set_text( GTK_ENTRY( entry ), text );
 		g_free( text );
-		nact_gtk_utils_set_editable( G_OBJECT( entry ), editable );
+		base_gtk_utils_set_editable( G_OBJECT( entry ), editable );
 
 		browse_button = base_window_get_widget( BASE_WINDOW( instance ), "TryExecButton" );
-		nact_gtk_utils_set_editable( G_OBJECT( browse_button ), editable );
+		base_gtk_utils_set_editable( G_OBJECT( browse_button ), editable );
 
 		entry = base_window_get_widget( BASE_WINDOW( instance ), "ShowIfRegisteredEntry" );
 		text = context ? na_object_get_show_if_registered( context ) : g_strdup( "" );
 		text = text && strlen( text ) ? text : g_strdup( "" );
 		gtk_entry_set_text( GTK_ENTRY( entry ), text );
 		g_free( text );
-		nact_gtk_utils_set_editable( G_OBJECT( entry ), editable );
+		base_gtk_utils_set_editable( G_OBJECT( entry ), editable );
 
 		entry = base_window_get_widget( BASE_WINDOW( instance ), "ShowIfTrueEntry" );
 		text = context ? na_object_get_show_if_true( context ) : g_strdup( "" );
 		text = text && strlen( text ) ? text : g_strdup( "" );
 		gtk_entry_set_text( GTK_ENTRY( entry ), text );
 		g_free( text );
-		nact_gtk_utils_set_editable( G_OBJECT( entry ), editable );
+		base_gtk_utils_set_editable( G_OBJECT( entry ), editable );
 
 		entry = base_window_get_widget( BASE_WINDOW( instance ), "ShowIfRunningEntry" );
 		text = context ? na_object_get_show_if_running( context ) : g_strdup( "" );
 		text = text && strlen( text ) ? text : g_strdup( "" );
 		gtk_entry_set_text( GTK_ENTRY( entry ), text );
 		g_free( text );
-		nact_gtk_utils_set_editable( G_OBJECT( entry ), editable );
+		base_gtk_utils_set_editable( G_OBJECT( entry ), editable );
 
 		browse_button = base_window_get_widget( BASE_WINDOW( instance ), "ShowIfRunningButton" );
-		nact_gtk_utils_set_editable( G_OBJECT( browse_button ), editable );
+		base_gtk_utils_set_editable( G_OBJECT( browse_button ), editable );
 
 		st_on_selection_change = FALSE;
 
@@ -544,7 +544,7 @@ on_show_always_toggled( GtkToggleButton *toggle_button, NactIEnvironmentTab *ins
 			}
 
 		} else {
-			nact_gtk_utils_radio_reset_initial_state(
+			base_gtk_utils_radio_reset_initial_state(
 					GTK_RADIO_BUTTON( toggle_button ), G_CALLBACK( on_show_always_toggled ));
 		}
 	}
@@ -583,7 +583,7 @@ on_only_show_toggled( GtkToggleButton *toggle_button, NactIEnvironmentTab *insta
 			}
 
 		} else {
-			nact_gtk_utils_radio_reset_initial_state(
+			base_gtk_utils_radio_reset_initial_state(
 					GTK_RADIO_BUTTON( toggle_button ), G_CALLBACK( on_only_show_toggled ));
 		}
 	}
@@ -622,7 +622,7 @@ on_do_not_show_toggled( GtkToggleButton *toggle_button, NactIEnvironmentTab *ins
 			}
 
 		} else {
-			nact_gtk_utils_radio_reset_initial_state(
+			base_gtk_utils_radio_reset_initial_state(
 					GTK_RADIO_BUTTON( toggle_button ), G_CALLBACK( on_do_not_show_toggled ));
 		}
 	}
@@ -699,7 +699,7 @@ on_try_exec_browse( GtkButton *button, NactIEnvironmentTab *instance )
 
 	entry = base_window_get_widget( BASE_WINDOW( instance ), "TryExecEntry" );
 
-	nact_gtk_utils_select_file(
+	base_gtk_utils_select_file(
 			BASE_WINDOW( instance ),
 			_( "Choosing an executable" ), NA_IPREFS_TRY_EXEC_WSP,
 			entry, NA_IPREFS_TRY_EXEC_URI );
@@ -757,7 +757,7 @@ on_show_if_running_browse( GtkButton *button, NactIEnvironmentTab *instance )
 
 	entry = base_window_get_widget( BASE_WINDOW( instance ), "ShowIfRunningEntry" );
 
-	nact_gtk_utils_select_file(
+	base_gtk_utils_select_file(
 			BASE_WINDOW( instance ),
 			_( "Choosing an executable" ), NA_IPREFS_SHOW_IF_RUNNING_WSP,
 			entry, NA_IPREFS_SHOW_IF_RUNNING_URI );
diff --git a/src/nact/nact-iexecution-tab.c b/src/nact/nact-iexecution-tab.c
index 4c02f4f..15b9fd9 100644
--- a/src/nact/nact-iexecution-tab.c
+++ b/src/nact/nact-iexecution-tab.c
@@ -36,7 +36,7 @@
 
 #include <api/na-object-api.h>
 
-#include "nact-gtk-utils.h"
+#include "base-gtk-utils.h"
 #include "nact-main-tab.h"
 #include "nact-iexecution-tab.h"
 
@@ -262,22 +262,22 @@ on_tab_updatable_selection_changed( NactIExecutionTab *instance, gint count_sele
 		gtk_toggle_button_set_inconsistent( GTK_TOGGLE_BUTTON( normal_toggle ), profile == NULL );
 
 		if( !strcmp( mode, "Normal" )){
-			nact_gtk_utils_radio_set_initial_state(
+			base_gtk_utils_radio_set_initial_state(
 					GTK_RADIO_BUTTON( normal_toggle ),
 					G_CALLBACK( on_normal_mode_toggled ), instance, editable, ( profile != NULL ));
 
 		} else if( !strcmp( mode, "Terminal" )){
-			nact_gtk_utils_radio_set_initial_state(
+			base_gtk_utils_radio_set_initial_state(
 					GTK_RADIO_BUTTON( terminal_toggle ),
 					G_CALLBACK( on_terminal_mode_toggled ), instance, editable, ( profile != NULL ));
 
 		} else if( !strcmp( mode, "Embedded" )){
-			nact_gtk_utils_radio_set_initial_state(
+			base_gtk_utils_radio_set_initial_state(
 					GTK_RADIO_BUTTON( embedded_toggle ),
 					G_CALLBACK( on_embedded_mode_toggled ), instance, editable, ( profile != NULL ));
 
 		} else if( !strcmp( mode, "DisplayOutput" )){
-			nact_gtk_utils_radio_set_initial_state(
+			base_gtk_utils_radio_set_initial_state(
 					GTK_RADIO_BUTTON( display_toggle ),
 					G_CALLBACK( on_display_mode_toggled ), instance, editable, ( profile != NULL ));
 
@@ -289,19 +289,19 @@ on_tab_updatable_selection_changed( NactIExecutionTab *instance, gint count_sele
 
 		notify = profile ? na_object_get_startup_notify( profile ) : FALSE;
 		notify_check = base_window_get_widget( BASE_WINDOW( instance ), "StartupNotifyButton" );
-		nact_gtk_utils_set_editable( G_OBJECT( notify_check ), editable );
+		base_gtk_utils_set_editable( G_OBJECT( notify_check ), editable );
 		gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( notify_check ), notify );
 
 		class = profile ? na_object_get_startup_class( profile ) : g_strdup( "" );
 		entry = base_window_get_widget( BASE_WINDOW( instance ), "StartupWMClassEntry" );
 		gtk_entry_set_text( GTK_ENTRY( entry ), class );
-		nact_gtk_utils_set_editable( G_OBJECT( entry ), editable );
+		base_gtk_utils_set_editable( G_OBJECT( entry ), editable );
 		g_free( class );
 
 		user = profile ? na_object_get_execute_as( profile ) : g_strdup( "" );
 		entry = base_window_get_widget( BASE_WINDOW( instance ), "ExecuteAsEntry" );
 		gtk_entry_set_text( GTK_ENTRY( entry ), user );
-		nact_gtk_utils_set_editable( G_OBJECT( entry ), editable );
+		base_gtk_utils_set_editable( G_OBJECT( entry ), editable );
 		g_free( user );
 
 		st_on_selection_change = FALSE;
@@ -364,7 +364,7 @@ execution_mode_toggle( NactIExecutionTab *instance, GtkToggleButton *toggle_butt
 			}
 
 		} else {
-			nact_gtk_utils_radio_reset_initial_state( GTK_RADIO_BUTTON( toggle_button ), cb );
+			base_gtk_utils_radio_reset_initial_state( GTK_RADIO_BUTTON( toggle_button ), cb );
 		}
 	}
 }
diff --git a/src/nact/nact-ifolders-tab.c b/src/nact/nact-ifolders-tab.c
index 8cefca5..17d180d 100644
--- a/src/nact/nact-ifolders-tab.c
+++ b/src/nact/nact-ifolders-tab.c
@@ -40,9 +40,8 @@
 
 #include <core/na-iprefs.h>
 
-#include "base-iprefs.h"
 #include "base-window.h"
-#include "nact-gtk-utils.h"
+#include "base-gtk-utils.h"
 #include "nact-application.h"
 #include "nact-main-tab.h"
 #include "nact-match-list.h"
@@ -235,7 +234,7 @@ on_tab_updatable_selection_changed( NactIFoldersTab *instance, gint count_select
 
 	context = nact_main_tab_get_context( NACT_MAIN_WINDOW( instance ), &editable );
 	button = base_window_get_widget( BASE_WINDOW( instance ), "FolderBrowseButton" );
-	nact_gtk_utils_set_editable( G_OBJECT( button ), editable );
+	base_gtk_utils_set_editable( G_OBJECT( button ), editable );
 }
 
 static void
@@ -290,7 +289,7 @@ on_browse_folder_clicked( GtkButton *button, BaseWindow *window )
 	updater = nact_application_get_updater( application );
 	settings = na_pivot_get_settings( NA_PIVOT( updater ));
 
-	base_iprefs_restore_window_position( window, NA_IPREFS_FOLDER_CHOOSER_WSP );
+	base_gtk_utils_restore_window_position( window, NA_IPREFS_FOLDER_CHOOSER_WSP );
 
 	uri = na_settings_get_string( settings, NA_IPREFS_FOLDER_CHOOSER_URI, NULL, NULL );
 	if( uri && g_utf8_strlen( uri, -1 )){
@@ -309,7 +308,7 @@ on_browse_folder_clicked( GtkButton *button, BaseWindow *window )
 		g_free( uri );
 	}
 
-	base_iprefs_save_window_position( window, NA_IPREFS_FOLDER_CHOOSER_WSP );
+	base_gtk_utils_save_window_position( window, NA_IPREFS_FOLDER_CHOOSER_WSP );
 
 	gtk_widget_destroy( dialog );
 }
diff --git a/src/nact/nact-iproperties-tab.c b/src/nact/nact-iproperties-tab.c
index 5668994..385f244 100644
--- a/src/nact/nact-iproperties-tab.c
+++ b/src/nact/nact-iproperties-tab.c
@@ -40,7 +40,7 @@
 
 #include <core/na-io-provider.h>
 
-#include "nact-gtk-utils.h"
+#include "base-gtk-utils.h"
 #include "nact-iproperties-tab.h"
 #include "nact-main-tab.h"
 
@@ -270,14 +270,14 @@ on_tab_updatable_selection_changed( NactIPropertiesTab *instance, gint count_sel
 		enabled_button = get_enabled_button( instance );
 		enabled_item = item ? na_object_is_enabled( NA_OBJECT_ITEM( item )) : FALSE;
 		gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( enabled_button ), enabled_item );
-		nact_gtk_utils_set_editable( G_OBJECT( enabled_button ), editable );
+		base_gtk_utils_set_editable( G_OBJECT( enabled_button ), editable );
 
 		label_widget = base_window_get_widget( BASE_WINDOW( instance ), "ActionDescriptionText" );
 		buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW( label_widget ));
 		label = item ? na_object_get_description( item ) : g_strdup( "" );
 		gtk_text_buffer_set_text( buffer, label, -1 );
 		g_free( label );
-		nact_gtk_utils_set_editable( G_OBJECT( label_widget ), editable );
+		base_gtk_utils_set_editable( G_OBJECT( label_widget ), editable );
 
 		shortcut_button = base_window_get_widget( BASE_WINDOW( instance ), "SuggestedShortcutButton" );
 		shortcut = item ? na_object_get_shortcut( item ) : g_strdup( "" );
@@ -287,7 +287,7 @@ on_tab_updatable_selection_changed( NactIPropertiesTab *instance, gint count_sel
 		}
 		gtk_button_set_label( GTK_BUTTON( shortcut_button ), shortcut );
 		g_free( shortcut );
-		nact_gtk_utils_set_editable( G_OBJECT( shortcut_button ), editable );
+		base_gtk_utils_set_editable( G_OBJECT( shortcut_button ), editable );
 
 		/* TODO: don't know how to edit a shortcut for now */
 		gtk_widget_set_sensitive( shortcut_button, FALSE );
@@ -297,7 +297,7 @@ on_tab_updatable_selection_changed( NactIPropertiesTab *instance, gint count_sel
 		 */
 		readonly_button = GTK_TOGGLE_BUTTON( base_window_get_widget( BASE_WINDOW( instance ), "ActionReadonlyButton" ));
 		gtk_toggle_button_set_active( readonly_button, item ? na_object_is_readonly( item ) : FALSE );
-		nact_gtk_utils_set_editable( G_OBJECT( readonly_button ), FALSE );
+		base_gtk_utils_set_editable( G_OBJECT( readonly_button ), FALSE );
 
 		label_widget = base_window_get_widget( BASE_WINDOW( instance ), "ActionItemID" );
 		label = item ? na_object_get_id( item ) : g_strdup( "" );
diff --git a/src/nact/nact-ischemes-tab.c b/src/nact/nact-ischemes-tab.c
index 9c2ce5f..85aab62 100644
--- a/src/nact/nact-ischemes-tab.c
+++ b/src/nact/nact-ischemes-tab.c
@@ -37,7 +37,7 @@
 #include <api/na-core-utils.h>
 #include <api/na-object-api.h>
 
-#include "nact-gtk-utils.h"
+#include "base-gtk-utils.h"
 #include "nact-main-tab.h"
 #include "nact-match-list.h"
 #include "nact-add-scheme-dialog.h"
@@ -228,7 +228,7 @@ on_tab_updatable_selection_changed( BaseWindow *window, gint count_selected )
 
 	context = nact_main_tab_get_context( NACT_MAIN_WINDOW( window ), &editable );
 	button = base_window_get_widget( window, "AddFromDefaultButton" );
-	nact_gtk_utils_set_editable( G_OBJECT( button ), editable );
+	base_gtk_utils_set_editable( G_OBJECT( button ), editable );
 }
 
 static void
diff --git a/src/nact/nact-main-statusbar.c b/src/nact/nact-main-statusbar.c
index d663635..5e1c5df 100644
--- a/src/nact/nact-main-statusbar.c
+++ b/src/nact/nact-main-statusbar.c
@@ -34,7 +34,7 @@
 
 #include <core/na-io-provider.h>
 
-#include "nact-gtk-utils.h"
+#include "base-gtk-utils.h"
 #include "nact-main-statusbar.h"
 
 typedef struct {
@@ -229,7 +229,7 @@ nact_main_statusbar_set_locked( NactMainWindow *window, gboolean readonly, gint
 	}
 
 	if( set_pixbuf ){
-		nact_gtk_utils_render( NULL, image, GTK_ICON_SIZE_MENU );
+		base_gtk_utils_render( NULL, image, GTK_ICON_SIZE_MENU );
 	}
 }
 
diff --git a/src/nact/nact-main-window.c b/src/nact/nact-main-window.c
index ec67618..31d6ff4 100644
--- a/src/nact/nact-main-window.c
+++ b/src/nact/nact-main-window.c
@@ -32,10 +32,8 @@
 #include <config.h>
 #endif
 
-#include <stdlib.h>
-
 #include <glib/gi18n.h>
-#include <gtk/gtk.h>
+#include <stdlib.h>
 
 #include <api/na-object-api.h>
 
@@ -44,7 +42,6 @@
 #include <core/na-iprefs.h>
 #include <core/na-pivot.h>
 
-#include "base-iprefs.h"
 #include "nact-iactions-list.h"
 #include "nact-iaction-tab.h"
 #include "nact-icommand-tab.h"
diff --git a/src/nact/nact-match-list.c b/src/nact/nact-match-list.c
index 56a26bb..db5c3f9 100644
--- a/src/nact/nact-match-list.c
+++ b/src/nact/nact-match-list.c
@@ -39,7 +39,7 @@
 #include <api/na-core-utils.h>
 
 #include "base-keysyms.h"
-#include "nact-gtk-utils.h"
+#include "base-gtk-utils.h"
 #include "nact-main-tab.h"
 #include "nact-match-list.h"
 
@@ -352,10 +352,10 @@ nact_match_list_on_selection_changed( BaseWindow *window, const gchar *tab_name,
 	}
 
 	column = gtk_tree_view_get_column( data->listview, ITEM_COLUMN );
-	nact_gtk_utils_set_editable( G_OBJECT( column ), data->editable_item && data->editable_filter );
+	base_gtk_utils_set_editable( G_OBJECT( column ), data->editable_item && data->editable_filter );
 
-	nact_gtk_utils_set_editable( G_OBJECT( data->addbutton ), data->editable_item );
-	nact_gtk_utils_set_editable( G_OBJECT( data->removebutton ), data->editable_item );
+	base_gtk_utils_set_editable( G_OBJECT( data->addbutton ), data->editable_item );
+	base_gtk_utils_set_editable( G_OBJECT( data->removebutton ), data->editable_item );
 	gtk_widget_set_sensitive( data->removebutton, FALSE );
 
 	st_on_selection_change = FALSE;
diff --git a/src/nact/nact-preferences-editor.c b/src/nact/nact-preferences-editor.c
index 5d6fb9c..e6108ff 100644
--- a/src/nact/nact-preferences-editor.c
+++ b/src/nact/nact-preferences-editor.c
@@ -38,7 +38,7 @@
 
 #include "nact-application.h"
 #include "nact-export-format.h"
-#include "nact-gtk-utils.h"
+#include "base-gtk-utils.h"
 #include "nact-schemes-list.h"
 #include "nact-providers-list.h"
 #include "nact-preferences-editor.h"
@@ -407,7 +407,7 @@ on_base_initialize_base_window( NactPreferencesEditor *editor )
 		ok_button = base_window_get_widget( BASE_WINDOW( editor ), "OKButton" );
 		base_window_signal_connect( BASE_WINDOW( editor ),
 				G_OBJECT( ok_button ), "clicked", G_CALLBACK( on_ok_clicked ));
-		nact_gtk_utils_set_editable( G_OBJECT( ok_button ), !editor->private->preferences_locked );
+		base_gtk_utils_set_editable( G_OBJECT( ok_button ), !editor->private->preferences_locked );
 	}
 }
 
@@ -475,7 +475,7 @@ order_mode_setup( NactPreferencesEditor *editor, NAPivot *pivot )
 			break;
 	}
 
-	nact_gtk_utils_radio_set_initial_state(
+	base_gtk_utils_radio_set_initial_state(
 			GTK_RADIO_BUTTON( active_button ),
 			active_handler, editor, editable, !editor->private->preferences_locked );
 }
@@ -512,7 +512,7 @@ order_mode_on_toggled( NactPreferencesEditor *editor, GtkToggleButton *toggle_bu
 			editor->private->order_mode = order_mode;
 		}
 	} else {
-		nact_gtk_utils_radio_reset_initial_state( GTK_RADIO_BUTTON( toggle_button ), cb );
+		base_gtk_utils_radio_reset_initial_state( GTK_RADIO_BUTTON( toggle_button ), cb );
 	}
 }
 
@@ -527,7 +527,7 @@ root_menu_setup( NactPreferencesEditor *editor, NASettings *settings )
 	editor->private->root_menu = na_settings_get_boolean( settings, NA_IPREFS_ITEMS_CREATE_ROOT_MENU, NULL, &editor->private->root_menu_mandatory );
 	editable = !editor->private->preferences_locked && !editor->private->root_menu_mandatory;
 
-	nact_gtk_utils_toggle_set_initial_state( BASE_WINDOW( editor ),
+	base_gtk_utils_toggle_set_initial_state( BASE_WINDOW( editor ),
 			"CreateRootMenuButton", G_CALLBACK( root_menu_on_toggled ),
 			editor->private->root_menu, editable, !editor->private->preferences_locked );
 }
@@ -543,7 +543,7 @@ root_menu_on_toggled( GtkToggleButton *button, NactPreferencesEditor *editor )
 		editor->private->root_menu = gtk_toggle_button_get_active( button );
 
 	} else {
-		nact_gtk_utils_toggle_reset_initial_state( button );
+		base_gtk_utils_toggle_reset_initial_state( button );
 	}
 }
 
@@ -558,7 +558,7 @@ about_item_setup( NactPreferencesEditor *editor, NASettings *settings )
 	editor->private->about_item = na_settings_get_boolean( settings, NA_IPREFS_ITEMS_ADD_ABOUT_ITEM, NULL, &editor->private->about_item_mandatory );
 	editable = !editor->private->preferences_locked && !editor->private->about_item_mandatory;
 
-	nact_gtk_utils_toggle_set_initial_state( BASE_WINDOW( editor ),
+	base_gtk_utils_toggle_set_initial_state( BASE_WINDOW( editor ),
 			"AddAboutButton", G_CALLBACK( about_item_on_toggled ),
 			editor->private->about_item, editable, !editor->private->preferences_locked );
 }
@@ -574,7 +574,7 @@ about_item_on_toggled( GtkToggleButton *button, NactPreferencesEditor *editor )
 		editor->private->about_item = gtk_toggle_button_get_active( button );
 
 	} else {
-		nact_gtk_utils_toggle_reset_initial_state( button );
+		base_gtk_utils_toggle_reset_initial_state( button );
 	}
 }
 
@@ -589,7 +589,7 @@ relabel_menu_setup( NactPreferencesEditor *editor, NASettings *settings )
 	editor->private->relabel_menu = na_settings_get_boolean( settings, NA_IPREFS_RELABEL_DUPLICATE_MENU, NULL, &editor->private->relabel_menu_mandatory );
 	editable = !editor->private->preferences_locked && !editor->private->relabel_menu_mandatory;
 
-	nact_gtk_utils_toggle_set_initial_state( BASE_WINDOW( editor ),
+	base_gtk_utils_toggle_set_initial_state( BASE_WINDOW( editor ),
 			"RelabelMenuButton", G_CALLBACK( relabel_menu_on_toggled ),
 			editor->private->relabel_menu, editable, !editor->private->preferences_locked );
 }
@@ -605,7 +605,7 @@ relabel_menu_on_toggled( GtkToggleButton *button, NactPreferencesEditor *editor
 		editor->private->relabel_menu = gtk_toggle_button_get_active( button );
 
 	} else {
-		nact_gtk_utils_toggle_reset_initial_state( button );
+		base_gtk_utils_toggle_reset_initial_state( button );
 	}
 }
 
@@ -620,7 +620,7 @@ relabel_action_setup( NactPreferencesEditor *editor, NASettings *settings )
 	editor->private->relabel_action = na_settings_get_boolean( settings, NA_IPREFS_RELABEL_DUPLICATE_ACTION, NULL, &editor->private->relabel_action_mandatory );
 	editable = !editor->private->preferences_locked && !editor->private->relabel_action_mandatory;
 
-	nact_gtk_utils_toggle_set_initial_state( BASE_WINDOW( editor ),
+	base_gtk_utils_toggle_set_initial_state( BASE_WINDOW( editor ),
 			"RelabelActionButton", G_CALLBACK( relabel_action_on_toggled ),
 			editor->private->relabel_action, editable, !editor->private->preferences_locked );
 }
@@ -636,7 +636,7 @@ relabel_action_on_toggled( GtkToggleButton *button, NactPreferencesEditor *edito
 		editor->private->relabel_action = gtk_toggle_button_get_active( button );
 
 	} else {
-		nact_gtk_utils_toggle_reset_initial_state( button );
+		base_gtk_utils_toggle_reset_initial_state( button );
 	}
 }
 
@@ -651,7 +651,7 @@ relabel_profile_setup( NactPreferencesEditor *editor, NASettings *settings )
 	editor->private->relabel_profile = na_settings_get_boolean( settings, NA_IPREFS_RELABEL_DUPLICATE_PROFILE, NULL, &editor->private->relabel_profile_mandatory );
 	editable = !editor->private->preferences_locked && !editor->private->relabel_profile_mandatory;
 
-	nact_gtk_utils_toggle_set_initial_state( BASE_WINDOW( editor ),
+	base_gtk_utils_toggle_set_initial_state( BASE_WINDOW( editor ),
 			"RelabelProfileButton", G_CALLBACK( relabel_profile_on_toggled ),
 			editor->private->relabel_profile, editable, !editor->private->preferences_locked );
 }
@@ -667,7 +667,7 @@ relabel_profile_on_toggled( GtkToggleButton *button, NactPreferencesEditor *edit
 		editor->private->relabel_profile = gtk_toggle_button_get_active( button );
 
 	} else {
-		nact_gtk_utils_toggle_reset_initial_state( button );
+		base_gtk_utils_toggle_reset_initial_state( button );
 	}
 }
 
@@ -682,7 +682,7 @@ esc_quit_setup( NactPreferencesEditor *editor, NASettings *settings )
 	editor->private->esc_quit = na_settings_get_boolean( settings, NA_IPREFS_ASSISTANT_ESC_QUIT, NULL, &editor->private->esc_quit_mandatory );
 	editable = !editor->private->preferences_locked && !editor->private->esc_quit_mandatory;
 
-	nact_gtk_utils_toggle_set_initial_state( BASE_WINDOW( editor ),
+	base_gtk_utils_toggle_set_initial_state( BASE_WINDOW( editor ),
 			"EscCloseButton", G_CALLBACK( esc_quit_on_toggled ),
 			editor->private->esc_quit, editable, !editor->private->preferences_locked );
 }
@@ -701,7 +701,7 @@ esc_quit_on_toggled( GtkToggleButton *button, NactPreferencesEditor *editor )
 		gtk_widget_set_sensitive( confirm_button, editor->private->esc_quit );
 
 	} else {
-		nact_gtk_utils_toggle_reset_initial_state( button );
+		base_gtk_utils_toggle_reset_initial_state( button );
 	}
 }
 
@@ -717,7 +717,7 @@ esc_confirm_setup( NactPreferencesEditor *editor, NASettings *settings )
 	editor->private->esc_confirm = na_settings_get_boolean( settings, NA_IPREFS_ASSISTANT_ESC_CONFIRM, NULL, &editor->private->esc_confirm_mandatory );
 	editable = !editor->private->preferences_locked && !editor->private->esc_confirm_mandatory;
 
-	nact_gtk_utils_toggle_set_initial_state( BASE_WINDOW( editor ),
+	base_gtk_utils_toggle_set_initial_state( BASE_WINDOW( editor ),
 			"EscConfirmButton", G_CALLBACK( esc_confirm_on_toggled ),
 			editor->private->esc_confirm, editable, !editor->private->preferences_locked );
 }
@@ -733,7 +733,7 @@ esc_confirm_on_toggled( GtkToggleButton *button, NactPreferencesEditor *editor )
 		editor->private->esc_confirm = gtk_toggle_button_get_active( button );
 
 	} else {
-		nact_gtk_utils_toggle_reset_initial_state( button );
+		base_gtk_utils_toggle_reset_initial_state( button );
 	}
 }
 
@@ -762,7 +762,7 @@ auto_save_setup( NactPreferencesEditor *editor, NASettings *settings )
 			G_OBJECT( spin_button ), "value-changed", G_CALLBACK( auto_save_period_on_change_value ));
 
 	editable = !editor->private->preferences_locked && !editor->private->auto_save_mandatory;
-	nact_gtk_utils_toggle_set_initial_state( BASE_WINDOW( editor ),
+	base_gtk_utils_toggle_set_initial_state( BASE_WINDOW( editor ),
 			"AutoSaveCheckButton", G_CALLBACK( auto_save_on_toggled ),
 			editor->private->auto_save, editable, !editor->private->preferences_locked );
 }
@@ -780,7 +780,7 @@ auto_save_on_toggled( GtkToggleButton *button, NactPreferencesEditor *editor )
 		editor->private->auto_save = gtk_toggle_button_get_active( button );
 
 	} else {
-		nact_gtk_utils_toggle_reset_initial_state( button );
+		base_gtk_utils_toggle_reset_initial_state( button );
 	}
 
 	sensitive = editor->private->auto_save && !editor->private->preferences_locked;
@@ -849,7 +849,7 @@ import_mode_setup( NactPreferencesEditor *editor, NAPivot *pivot )
 			break;
 	}
 
-	nact_gtk_utils_radio_set_initial_state(
+	base_gtk_utils_radio_set_initial_state(
 			GTK_RADIO_BUTTON( active_button ),
 			active_handler, editor, editable, !editor->private->preferences_locked );
 }
@@ -892,7 +892,7 @@ import_mode_on_toggled( NactPreferencesEditor *editor, GtkToggleButton *toggle_b
 			editor->private->import_mode = import_mode;
 		}
 	} else {
-		nact_gtk_utils_radio_reset_initial_state( GTK_RADIO_BUTTON( toggle_button ), cb );
+		base_gtk_utils_radio_reset_initial_state( GTK_RADIO_BUTTON( toggle_button ), cb );
 	}
 }
 
diff --git a/src/nact/nact-providers-list.c b/src/nact/nact-providers-list.c
index 6b1eef1..2101dcd 100644
--- a/src/nact/nact-providers-list.c
+++ b/src/nact/nact-providers-list.c
@@ -42,7 +42,7 @@
 #include <core/na-iprefs.h>
 
 #include "nact-application.h"
-#include "nact-gtk-utils.h"
+#include "base-gtk-utils.h"
 #include "nact-providers-list.h"
 
 /* column ordering
diff --git a/src/nact/nact-schemes-list.c b/src/nact/nact-schemes-list.c
index cc1c5d4..faf4293 100644
--- a/src/nact/nact-schemes-list.c
+++ b/src/nact/nact-schemes-list.c
@@ -41,7 +41,7 @@
 
 #include "base-keysyms.h"
 #include "nact-application.h"
-#include "nact-gtk-utils.h"
+#include "base-gtk-utils.h"
 #include "nact-main-tab.h"
 #include "nact-schemes-list.h"
 
@@ -314,7 +314,7 @@ init_view_connect_signals( SchemesListData *data )
 			G_CALLBACK( on_selection_changed ));
 
 	column = gtk_tree_view_get_column( data->treeview, SCHEMES_KEYWORD_COLUMN );
-	nact_gtk_utils_set_editable( G_OBJECT( column ), data->editable );
+	base_gtk_utils_set_editable( G_OBJECT( column ), data->editable );
 	if( data->editable ){
 		renderers = gtk_cell_layout_get_cells( GTK_CELL_LAYOUT( column ));
 		base_window_signal_connect(
@@ -325,7 +325,7 @@ init_view_connect_signals( SchemesListData *data )
 	}
 
 	column = gtk_tree_view_get_column( data->treeview, SCHEMES_DESC_COLUMN );
-	nact_gtk_utils_set_editable( G_OBJECT( column ), data->editable );
+	base_gtk_utils_set_editable( G_OBJECT( column ), data->editable );
 	if( data->editable ){
 		renderers = gtk_cell_layout_get_cells( GTK_CELL_LAYOUT( column ));
 		base_window_signal_connect(
diff --git a/src/nact/nact-tree-model.c b/src/nact/nact-tree-model.c
index 4265e4a..8a2b949 100644
--- a/src/nact/nact-tree-model.c
+++ b/src/nact/nact-tree-model.c
@@ -40,7 +40,7 @@
 
 #include "nact-application.h"
 #include "nact-clipboard.h"
-#include "nact-gtk-utils.h"
+#include "base-gtk-utils.h"
 #include "nact-iactions-list.h"
 #include "nact-tree-model.h"
 #include "nact-tree-model-dnd.h"
@@ -887,7 +887,7 @@ display_item( GtkTreeStore *model, GtkTreeView *treeview, GtkTreeIter *iter, con
 
 	if( NA_IS_OBJECT_ITEM( object )){
 		gchar *icon_name = na_object_get_icon( object );
-		GdkPixbuf *icon = nact_gtk_utils_get_pixbuf( icon_name, GTK_WIDGET( treeview ), GTK_ICON_SIZE_MENU );
+		GdkPixbuf *icon = base_gtk_utils_get_pixbuf( icon_name, GTK_WIDGET( treeview ), GTK_ICON_SIZE_MENU );
 		gtk_tree_store_set( model, iter, IACTIONS_LIST_ICON_COLUMN, icon, -1 );
 		g_object_unref( icon );
 	}