[nautilus-actions] na_settings is renamed to fma_settings
- From: Pierre Wieser <pwieser src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus-actions] na_settings is renamed to fma_settings
- Date: Wed, 15 Feb 2017 22:48:11 +0000 (UTC)
commit 60ff2c9119db3dd2f3e3a48a98f4f13124764579
Author: Pierre Wieser <pwieser trychlos org>
Date: Tue Sep 8 12:34:05 2015 +0200
na_settings is renamed to fma_settings
src/core/Makefile.am | 4 +-
src/core/fma-exporter.c | 2 +-
src/core/fma-gconf-migration.c | 2 +-
src/core/fma-gtk-utils.c | 8 +-
src/core/fma-icontext.c | 4 +-
src/core/fma-importer-ask.c | 12 +-
src/core/fma-importer.c | 4 +-
src/core/fma-importer.h | 2 +-
src/core/fma-io-provider.c | 16 +-
src/core/fma-iprefs.c | 12 +-
src/core/fma-pivot.c | 2 +-
src/core/fma-pivot.h | 2 +-
src/core/{na-settings.c => fma-settings.c} | 290 ++++++++++++++--------------
src/core/fma-settings.h | 166 ++++++++++++++++
src/core/na-marshal.def | 2 +-
src/core/na-settings.h | 166 ----------------
src/core/na-tokens.c | 4 +-
src/core/na-updater.c | 14 +-
src/nact/base-gtk-utils.c | 8 +-
src/nact/nact-add-capability-dialog.c | 4 +-
src/nact/nact-add-scheme-dialog.c | 4 +-
src/nact/nact-assistant-export.c | 22 +-
src/nact/nact-assistant-import.c | 16 +-
src/nact/nact-clipboard.c | 2 +-
src/nact/nact-confirm-logout.c | 4 +-
src/nact/nact-export-ask.c | 14 +-
src/nact/nact-icommand-tab.c | 12 +-
src/nact/nact-icon-chooser.c | 10 +-
src/nact/nact-ienvironment-tab.c | 10 +-
src/nact/nact-ifolders-tab.c | 8 +-
src/nact/nact-main-window.c | 6 +-
src/nact/nact-menu-file.c | 8 +-
src/nact/nact-menu-view.c | 12 +-
src/nact/nact-preferences-editor.c | 56 +++---
src/nact/nact-providers-list.c | 8 +-
src/nact/nact-schemes-list.c | 4 +-
src/nact/nact-sort-buttons.c | 8 +-
src/nact/nact-tree-model.c | 10 +-
src/plugin-menu/nautilus-actions.c | 30 ++--
src/plugin-menu/nautilus-module.c | 4 +-
src/utils/na-set-conf.c | 8 +-
41 files changed, 490 insertions(+), 490 deletions(-)
---
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index 9bd9e48..9ccb743 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -115,8 +115,8 @@ libna_core_la_SOURCES = \
fma-pivot.h \
fma-selected-info.c \
fma-selected-info.h \
- na-settings.c \
- na-settings.h \
+ fma-settings.c \
+ fma-settings.h \
fma-timeout.c \
na-tokens.c \
na-tokens.h \
diff --git a/src/core/fma-exporter.c b/src/core/fma-exporter.c
index b10d056..d86c71e 100644
--- a/src/core/fma-exporter.c
+++ b/src/core/fma-exporter.c
@@ -37,7 +37,7 @@
#include "fma-exporter.h"
#include "fma-export-format.h"
-#include "na-settings.h"
+#include "fma-settings.h"
typedef struct {
const gchar *format; /* export format saved in user's preferences */
diff --git a/src/core/fma-gconf-migration.c b/src/core/fma-gconf-migration.c
index 5c89300..0b1d968 100644
--- a/src/core/fma-gconf-migration.c
+++ b/src/core/fma-gconf-migration.c
@@ -40,7 +40,7 @@
*
* Migrate users actions and menus from GConf to .desktop files.
* Disable GConf I/O provider both for reading and writing.
- * Migrate users preferences to NASettings.
+ * Migrate users preferences to FMASettings.
*
* Since: 3.1
*/
diff --git a/src/core/fma-gtk-utils.c b/src/core/fma-gtk-utils.c
index 95d7a61..1a46583 100644
--- a/src/core/fma-gtk-utils.c
+++ b/src/core/fma-gtk-utils.c
@@ -35,7 +35,7 @@
#include <string.h>
#include "fma-gtk-utils.h"
-#include "na-settings.h"
+#include "fma-settings.h"
static void int_list_to_position( GList *list, gint *x, gint *y, gint *width, gint *height );
static GList *position_to_int_list( gint x, gint y, gint width, gint height );
@@ -168,7 +168,7 @@ fma_gtk_utils_restore_window_position( GtkWindow *toplevel, const gchar *wsp_nam
g_debug( "%s: toplevel=%p (%s), wsp_name=%s",
thisfn, ( void * ) toplevel, G_OBJECT_TYPE_NAME( toplevel ), wsp_name );
- list = na_settings_get_uint_list( wsp_name, NULL, NULL );
+ list = fma_settings_get_uint_list( wsp_name, NULL, NULL );
if( list ){
int_list_to_position( list, &x, &y, &width, &height );
@@ -184,7 +184,7 @@ fma_gtk_utils_restore_window_position( GtkWindow *toplevel, const gchar *wsp_nam
/* bad hack for the first time we open the main window
* try to target an ideal size and position
*/
- if( !strcmp( wsp_name, NA_IPREFS_MAIN_WINDOW_WSP )){
+ if( !strcmp( wsp_name, IPREFS_MAIN_WINDOW_WSP )){
if( x == 1 && y == 1 && width == 1 && height == 1 ){
x = 50;
y = 70;
@@ -234,7 +234,7 @@ fma_gtk_utils_save_window_position( GtkWindow *toplevel, const gchar *wsp_name )
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( x, y, width, height );
- na_settings_set_uint_list( wsp_name, list );
+ fma_settings_set_uint_list( wsp_name, list );
free_int_list( list );
}
diff --git a/src/core/fma-icontext.c b/src/core/fma-icontext.c
index 07f1b87..3779585 100644
--- a/src/core/fma-icontext.c
+++ b/src/core/fma-icontext.c
@@ -53,7 +53,7 @@
#include "fma-desktop-environment.h"
#include "fma-gnome-vfs-uri.h"
#include "fma-selected-info.h"
-#include "na-settings.h"
+#include "fma-settings.h"
/* private interface data
*/
@@ -527,7 +527,7 @@ is_candidate_for_show_in( const FMAIContext *object, guint target, GList *files
* but this occurs only once..
*/
if( !environment ){
- environment = na_settings_get_string( NA_IPREFS_DESKTOP_ENVIRONMENT, NULL, NULL );
+ environment = fma_settings_get_string( IPREFS_DESKTOP_ENVIRONMENT, NULL, NULL );
if( !environment || !strlen( environment )){
environment = ( gchar * ) fma_desktop_environment_detect_running_desktop();
}
diff --git a/src/core/fma-importer-ask.c b/src/core/fma-importer-ask.c
index d9a0cd0..e94597c 100644
--- a/src/core/fma-importer-ask.c
+++ b/src/core/fma-importer-ask.c
@@ -41,7 +41,7 @@
#include "fma-importer.h"
#include "fma-importer-ask.h"
#include "fma-ioptions-list.h"
-#include "na-settings.h"
+#include "fma-settings.h"
/* private class data
*/
@@ -352,7 +352,7 @@ fma_importer_ask_user( const FMAObjectItem *importing, const FMAObjectItem *exis
} while ( !on_dialog_response( dialog, code ));
mode = dialog->private->mode;
- fma_gtk_utils_save_window_position( dialog->private->toplevel, NA_IPREFS_IMPORT_ASK_USER_WSP
);
+ fma_gtk_utils_save_window_position( dialog->private->toplevel, IPREFS_IMPORT_ASK_USER_WSP );
if( parms->parent ){
gtk_widget_hide( GTK_WIDGET( dialog->private->toplevel ));
@@ -413,14 +413,14 @@ initialize_window( FMAImporterAsk *editor, GtkWindow *toplevel )
g_free( label );
widget = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( toplevel ), "AskModeVBox" );
- mode_id = na_settings_get_string( NA_IPREFS_IMPORT_ASK_USER_LAST_MODE, NULL, NULL );
+ mode_id = fma_settings_get_string( IPREFS_IMPORT_ASK_USER_LAST_MODE, NULL, NULL );
fma_ioptions_list_set_default( FMA_IOPTIONS_LIST( editor ), widget, mode_id );
g_free( mode_id );
button = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( toplevel ), "AskKeepChoiceButton" );
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( button ), editor->private->parms->keep_choice );
- fma_gtk_utils_restore_window_position( toplevel, NA_IPREFS_IMPORT_ASK_USER_WSP );
+ fma_gtk_utils_restore_window_position( toplevel, IPREFS_IMPORT_ASK_USER_WSP );
gtk_widget_show_all( GTK_WIDGET( toplevel ));
}
@@ -437,14 +437,14 @@ get_selected_mode( FMAImporterAsk *editor )
mode = fma_ioptions_list_get_selected( FMA_IOPTIONS_LIST( editor ), widget );
mode_id = fma_ioption_get_id( mode );
- na_settings_set_string( NA_IPREFS_IMPORT_ASK_USER_LAST_MODE, mode_id );
+ fma_settings_set_string( IPREFS_IMPORT_ASK_USER_LAST_MODE, mode_id );
g_free( mode_id );
editor->private->mode = fma_import_mode_get_id( FMA_IMPORT_MODE( mode ));
button = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( editor->private->toplevel ),
"AskKeepChoiceButton" );
keep = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( button ));
- na_settings_set_boolean( NA_IPREFS_IMPORT_ASK_USER_KEEP_LAST_CHOICE, keep );
+ fma_settings_set_boolean( IPREFS_IMPORT_ASK_USER_KEEP_LAST_CHOICE, keep );
}
/*
diff --git a/src/core/fma-importer.c b/src/core/fma-importer.c
index c1a5421..cb7a1cc 100644
--- a/src/core/fma-importer.c
+++ b/src/core/fma-importer.c
@@ -165,7 +165,7 @@ fma_importer_import_from_uris( const FMAPivot *pivot, FMAImporterParms *parms )
/* set the default import mode
*/
if( !parms->preferred_mode ){
- mode_str = na_settings_get_string( NA_IPREFS_IMPORT_PREFERRED_MODE, NULL, NULL );
+ mode_str = fma_settings_get_string( IPREFS_IMPORT_PREFERRED_MODE, NULL, NULL );
parms->preferred_mode = get_id_from_string( mode_str );
g_free( mode_str );
}
@@ -432,7 +432,7 @@ ask_user_for_mode( const FMAObjectItem *importing, const FMAObjectItem *existing
mode = fma_importer_ask_user( importing, existing, parms );
} else {
- mode_str = na_settings_get_string( NA_IPREFS_IMPORT_ASK_USER_LAST_MODE, NULL, NULL );
+ mode_str = fma_settings_get_string( IPREFS_IMPORT_ASK_USER_LAST_MODE, NULL, NULL );
mode = get_id_from_string( mode_str );
g_free( mode_str );
}
diff --git a/src/core/fma-importer.h b/src/core/fma-importer.h
index fa0b82b..f185b52 100644
--- a/src/core/fma-importer.h
+++ b/src/core/fma-importer.h
@@ -120,7 +120,7 @@ typedef struct {
GSList *uris; /* the list of uris to import */
FMAImporterCheckFn check_fn; /* the check_for_duplicate function */
void *check_fn_data; /* data to be passed to the check_fn function */
- guint preferred_mode; /* preferred import mode, defaults to
NA_IPREFS_IMPORT_PREFERRED_MODE */
+ guint preferred_mode; /* preferred import mode, defaults to
IPREFS_IMPORT_PREFERRED_MODE */
GtkWindow *parent_toplevel; /* parent toplevel */
}
FMAImporterParms;
diff --git a/src/core/fma-io-provider.c b/src/core/fma-io-provider.c
index 64f4f5c..dd77c47 100644
--- a/src/core/fma-io-provider.c
+++ b/src/core/fma-io-provider.c
@@ -414,7 +414,7 @@ io_providers_list_add_from_write_order( const FMAPivot *pivot, GList *objects_li
const gchar *id;
merged = objects_list;
- io_providers = na_settings_get_string_list( NA_IPREFS_IO_PROVIDERS_WRITE_ORDER, NULL, NULL );
+ io_providers = fma_settings_get_string_list( IPREFS_IO_PROVIDERS_WRITE_ORDER, NULL, NULL );
for( it = io_providers ; it ; it = it->next ){
id = ( const gchar * ) it->data;
@@ -521,8 +521,8 @@ io_providers_get_from_prefs( void )
guint prefix_len;
providers = NULL;
- groups = na_settings_get_groups();
- group_prefix = g_strdup_printf( "%s ", NA_IPREFS_IO_PROVIDER_GROUP );
+ groups = fma_settings_get_groups();
+ group_prefix = g_strdup_printf( "%s ", IPREFS_IO_PROVIDER_GROUP );
prefix_len = strlen( group_prefix );
for( it = groups ; it ; it = it->next ){
@@ -756,8 +756,8 @@ fma_io_provider_is_conf_readable( const FMAIOProvider *provider, const FMAPivot
if( !provider->private->dispose_has_run ){
- group = g_strdup_printf( "%s %s", NA_IPREFS_IO_PROVIDER_GROUP, provider->private->id );
- readable = na_settings_get_boolean_ex( group, NA_IPREFS_IO_PROVIDER_READABLE, NULL, mandatory
);
+ group = g_strdup_printf( "%s %s", IPREFS_IO_PROVIDER_GROUP, provider->private->id );
+ readable = fma_settings_get_boolean_ex( group, IPREFS_IO_PROVIDER_READABLE, NULL, mandatory );
g_free( group );
}
@@ -866,7 +866,7 @@ fma_io_provider_load_items( const FMAPivot *pivot, guint loadable_set, GSList **
/* build the items hierarchy
*/
- level_zero = na_settings_get_string_list( NA_IPREFS_ITEMS_LEVEL_ZERO_ORDER, NULL, NULL );
+ level_zero = fma_settings_get_string_list( IPREFS_ITEMS_LEVEL_ZERO_ORDER, NULL, NULL );
hierarchy = load_items_hierarchy_build( &flat, level_zero, TRUE, NULL );
@@ -947,8 +947,8 @@ is_conf_writable( const FMAIOProvider *provider, const FMAPivot *pivot, gboolean
gchar *group;
gboolean is_writable;
- group = g_strdup_printf( "%s %s", NA_IPREFS_IO_PROVIDER_GROUP, provider->private->id );
- is_writable = na_settings_get_boolean_ex( group, NA_IPREFS_IO_PROVIDER_WRITABLE, NULL, mandatory );
+ group = g_strdup_printf( "%s %s", IPREFS_IO_PROVIDER_GROUP, provider->private->id );
+ is_writable = fma_settings_get_boolean_ex( group, IPREFS_IO_PROVIDER_WRITABLE, NULL, mandatory );
g_free( group );
return( is_writable );
diff --git a/src/core/fma-iprefs.c b/src/core/fma-iprefs.c
index 48a6c64..39e36a7 100644
--- a/src/core/fma-iprefs.c
+++ b/src/core/fma-iprefs.c
@@ -37,7 +37,7 @@
#include "fma-importer.h"
#include "fma-iprefs.h"
-#include "na-settings.h"
+#include "fma-settings.h"
typedef struct {
guint id;
@@ -83,7 +83,7 @@ fma_iprefs_get_order_mode( gboolean *mandatory )
gchar *order_mode_str;
guint order_mode;
- order_mode_str = na_settings_get_string( NA_IPREFS_ITEMS_LIST_ORDER_MODE, NULL, mandatory );
+ order_mode_str = fma_settings_get_string( IPREFS_ITEMS_LIST_ORDER_MODE, NULL, mandatory );
order_mode = enum_map_id_from_string( st_order_mode, order_mode_str );
g_free( order_mode_str );
@@ -123,7 +123,7 @@ fma_iprefs_set_order_mode( guint mode )
const gchar *order_str;
order_str = enum_map_string_from_id( st_order_mode, mode );
- na_settings_set_string( NA_IPREFS_ITEMS_LIST_ORDER_MODE, order_str );
+ fma_settings_set_string( IPREFS_ITEMS_LIST_ORDER_MODE, order_str );
}
/*
@@ -139,7 +139,7 @@ fma_iprefs_get_tabs_pos( gboolean *mandatory )
gchar *tabs_pos_str;
guint tabs_pos;
- tabs_pos_str = na_settings_get_string( NA_IPREFS_MAIN_TABS_POS, NULL, mandatory );
+ tabs_pos_str = fma_settings_get_string( IPREFS_MAIN_TABS_POS, NULL, mandatory );
tabs_pos = enum_map_id_from_string( st_tabs_pos, tabs_pos_str );
g_free( tabs_pos_str );
@@ -158,7 +158,7 @@ fma_iprefs_set_tabs_pos( guint position )
const gchar *tabs_pos_str;
tabs_pos_str = enum_map_string_from_id( st_tabs_pos, 1+position );
- na_settings_set_string( NA_IPREFS_MAIN_TABS_POS, tabs_pos_str );
+ fma_settings_set_string( IPREFS_MAIN_TABS_POS, tabs_pos_str );
}
/*
@@ -197,7 +197,7 @@ fma_iprefs_write_level_zero( const GList *items, GSList **messages )
}
content = g_slist_reverse( content );
- written = na_settings_set_string_list( NA_IPREFS_ITEMS_LEVEL_ZERO_ORDER, content );
+ written = fma_settings_set_string_list( IPREFS_ITEMS_LEVEL_ZERO_ORDER, content );
fma_core_utils_slist_free( content );
diff --git a/src/core/fma-pivot.c b/src/core/fma-pivot.c
index 21576e4..b12c389 100644
--- a/src/core/fma-pivot.c
+++ b/src/core/fma-pivot.c
@@ -329,7 +329,7 @@ instance_dispose( GObject *object )
self->private->tree = fma_object_free_items( self->private->tree );
/* release the settings */
- na_settings_free();
+ fma_settings_free();
/* release the I/O Provider object list */
fma_io_provider_unref_io_providers_list();
diff --git a/src/core/fma-pivot.h b/src/core/fma-pivot.h
index acec270..e8abb51 100644
--- a/src/core/fma-pivot.h
+++ b/src/core/fma-pivot.h
@@ -75,7 +75,7 @@
#include <api/fma-iio-provider.h>
#include <api/fma-object-api.h>
-#include "na-settings.h"
+#include "fma-settings.h"
G_BEGIN_DECLS
diff --git a/src/core/na-settings.c b/src/core/fma-settings.c
similarity index 77%
rename from src/core/na-settings.c
rename to src/core/fma-settings.c
index 6d8cbaf..1b14711 100644
--- a/src/core/na-settings.c
+++ b/src/core/fma-settings.c
@@ -41,36 +41,36 @@
#include "api/fma-core-utils.h"
#include "api/fma-timeout.h"
-#include "na-settings.h"
+#include "fma-settings.h"
#define NA_SETTINGS_TYPE ( settings_get_type())
-#define NA_SETTINGS( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NA_SETTINGS_TYPE, NASettings ))
-#define NA_SETTINGS_CLASS( klass ) ( G_TYPE_CHECK_CLASS_CAST( klass, NA_SETTINGS_TYPE, NASettingsClass
))
+#define NA_SETTINGS( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NA_SETTINGS_TYPE, FMASettings
))
+#define NA_SETTINGS_CLASS( klass ) ( G_TYPE_CHECK_CLASS_CAST( klass, NA_SETTINGS_TYPE, FMASettingsClass
))
#define NA_IS_SETTINGS( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NA_SETTINGS_TYPE ))
#define NA_IS_SETTINGS_CLASS( klass ) ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NA_SETTINGS_TYPE ))
-#define NA_SETTINGS_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NA_SETTINGS_TYPE,
NASettingsClass ))
+#define NA_SETTINGS_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NA_SETTINGS_TYPE,
FMASettingsClass ))
-typedef struct _NASettingsPrivate NASettingsPrivate;
+typedef struct _FMASettingsPrivate FMASettingsPrivate;
typedef struct {
/*< private >*/
GObject parent;
- NASettingsPrivate *private;
+ FMASettingsPrivate *private;
}
- NASettings;
+ FMASettings;
-typedef struct _NASettingsClassPrivate NASettingsClassPrivate;
+typedef struct _FMASettingsClassPrivate FMASettingsClassPrivate;
typedef struct {
/*< private >*/
GObjectClass parent;
- NASettingsClassPrivate *private;
+ FMASettingsClassPrivate *private;
}
- NASettingsClass;
+ FMASettingsClass;
/* private class data
*/
-struct _NASettingsClassPrivate {
+struct _FMASettingsClassPrivate {
void *empty; /* so that gcc -pedantic is happy */
};
@@ -93,7 +93,7 @@ typedef struct {
*
* The monitored key usually is the real key read in the file;
* as a special case, composite keys are defined:
- * - NA_IPREFS_IO_PROVIDERS_READ_STATUS monitors the 'readable' key for all i/o providers
+ * - IPREFS_IO_PROVIDERS_READ_STATUS monitors the 'readable' key for all i/o providers
*
* Note that we actually monitor the _user_view_ of the configuration:
* e.g. if a key has a mandatory value in global conf, then the same
@@ -108,7 +108,7 @@ typedef struct {
/* private instance data
*/
-struct _NASettingsPrivate {
+struct _FMASettingsPrivate {
gboolean dispose_has_run;
KeyFile *mandatory;
KeyFile *user;
@@ -129,64 +129,64 @@ typedef struct {
KeyDef;
static const KeyDef st_def_keys[] = {
- { NA_IPREFS_ADMIN_PREFERENCES_LOCKED, GROUP_NACT, FMA_DATA_TYPE_BOOLEAN, "false" },
- { NA_IPREFS_ADMIN_IO_PROVIDERS_LOCKED, GROUP_RUNTIME, FMA_DATA_TYPE_BOOLEAN, "false" },
- { NA_IPREFS_ASSISTANT_ESC_CONFIRM, GROUP_NACT, FMA_DATA_TYPE_BOOLEAN, "true" },
- { NA_IPREFS_ASSISTANT_ESC_QUIT, GROUP_NACT, FMA_DATA_TYPE_BOOLEAN, "true" },
- { NA_IPREFS_CAPABILITY_ADD_CAPABILITY_WSP, GROUP_NACT, FMA_DATA_TYPE_UINT_LIST, "" },
- { NA_IPREFS_COMMAND_CHOOSER_WSP, GROUP_NACT, FMA_DATA_TYPE_UINT_LIST, "" },
- { NA_IPREFS_COMMAND_CHOOSER_URI, GROUP_NACT, FMA_DATA_TYPE_STRING, "file:///bin"
},
- { NA_IPREFS_COMMAND_LEGEND_WSP, GROUP_NACT, FMA_DATA_TYPE_UINT_LIST, "" },
- { NA_IPREFS_CONFIRM_LOGOUT_WSP, GROUP_NACT, FMA_DATA_TYPE_UINT_LIST, "" },
- { NA_IPREFS_DESKTOP_ENVIRONMENT, GROUP_RUNTIME, FMA_DATA_TYPE_STRING, "" },
- { NA_IPREFS_WORKING_DIR_WSP, GROUP_NACT, FMA_DATA_TYPE_UINT_LIST, "" },
- { NA_IPREFS_WORKING_DIR_URI, GROUP_NACT, FMA_DATA_TYPE_STRING, "file:///" },
- { NA_IPREFS_SHOW_IF_RUNNING_WSP, GROUP_NACT, FMA_DATA_TYPE_UINT_LIST, "" },
- { NA_IPREFS_SHOW_IF_RUNNING_URI, GROUP_NACT, FMA_DATA_TYPE_STRING, "file:///bin"
},
- { NA_IPREFS_TRY_EXEC_WSP, GROUP_NACT, FMA_DATA_TYPE_UINT_LIST, "" },
- { NA_IPREFS_TRY_EXEC_URI, GROUP_NACT, FMA_DATA_TYPE_STRING, "file:///bin"
},
- { NA_IPREFS_EXPORT_ASK_USER_WSP, GROUP_NACT, FMA_DATA_TYPE_UINT_LIST, "" },
- { NA_IPREFS_EXPORT_ASK_USER_LAST_FORMAT, GROUP_NACT, FMA_DATA_TYPE_STRING, "Desktop1" },
- { NA_IPREFS_EXPORT_ASK_USER_KEEP_LAST_CHOICE, GROUP_NACT, FMA_DATA_TYPE_BOOLEAN, "false" },
- { NA_IPREFS_EXPORT_ASSISTANT_WSP, GROUP_NACT, FMA_DATA_TYPE_UINT_LIST, "" },
- { NA_IPREFS_EXPORT_ASSISTANT_URI, GROUP_NACT, FMA_DATA_TYPE_STRING, "file:///tmp"
},
- { NA_IPREFS_EXPORT_ASSISTANT_PANED, GROUP_NACT, FMA_DATA_TYPE_UINT, "200" },
- { NA_IPREFS_EXPORT_PREFERRED_FORMAT, GROUP_NACT, FMA_DATA_TYPE_STRING, "Ask" },
- { NA_IPREFS_FOLDER_CHOOSER_WSP, GROUP_NACT, FMA_DATA_TYPE_UINT_LIST, "" },
- { NA_IPREFS_FOLDER_CHOOSER_URI, GROUP_NACT, FMA_DATA_TYPE_STRING, "file:///" },
- { NA_IPREFS_IMPORT_ASK_USER_WSP, GROUP_NACT, FMA_DATA_TYPE_UINT_LIST, "" },
- { NA_IPREFS_IMPORT_ASK_USER_LAST_MODE, GROUP_NACT, FMA_DATA_TYPE_STRING, "NoImport" },
- { NA_IPREFS_IMPORT_ASSISTANT_WSP, GROUP_NACT, FMA_DATA_TYPE_UINT_LIST, "" },
- { NA_IPREFS_IMPORT_ASSISTANT_URI, GROUP_NACT, FMA_DATA_TYPE_STRING, "file:///tmp"
},
- { NA_IPREFS_IMPORT_ASK_USER_KEEP_LAST_CHOICE, GROUP_NACT, FMA_DATA_TYPE_BOOLEAN, "false" },
- { NA_IPREFS_IMPORT_PREFERRED_MODE, GROUP_NACT, FMA_DATA_TYPE_STRING, "Ask" },
- { NA_IPREFS_IO_PROVIDERS_WRITE_ORDER, GROUP_NACT, FMA_DATA_TYPE_STRING_LIST, "" },
- { NA_IPREFS_ICON_CHOOSER_URI, GROUP_NACT, FMA_DATA_TYPE_STRING, "file:///" },
- { NA_IPREFS_ICON_CHOOSER_PANED, GROUP_NACT, FMA_DATA_TYPE_UINT, "200" },
- { NA_IPREFS_ICON_CHOOSER_WSP, GROUP_NACT, FMA_DATA_TYPE_UINT_LIST, "" },
- { NA_IPREFS_ITEMS_ADD_ABOUT_ITEM, GROUP_RUNTIME, FMA_DATA_TYPE_BOOLEAN, "true" },
- { NA_IPREFS_ITEMS_CREATE_ROOT_MENU, GROUP_RUNTIME, FMA_DATA_TYPE_BOOLEAN, "true" },
- { NA_IPREFS_ITEMS_LEVEL_ZERO_ORDER, GROUP_RUNTIME, FMA_DATA_TYPE_STRING_LIST, "" },
- { NA_IPREFS_ITEMS_LIST_ORDER_MODE, GROUP_RUNTIME, FMA_DATA_TYPE_STRING,
"AscendingOrder" },
- { NA_IPREFS_MAIN_PANED, GROUP_NACT, FMA_DATA_TYPE_UINT, "200" },
- { NA_IPREFS_MAIN_SAVE_AUTO, GROUP_NACT, FMA_DATA_TYPE_BOOLEAN, "false" },
- { NA_IPREFS_MAIN_SAVE_PERIOD, GROUP_NACT, FMA_DATA_TYPE_UINT, "5" },
- { NA_IPREFS_MAIN_TABS_POS, GROUP_NACT, FMA_DATA_TYPE_STRING, "Top" },
- { NA_IPREFS_MAIN_TOOLBAR_EDIT_DISPLAY, GROUP_NACT, FMA_DATA_TYPE_BOOLEAN, "true" },
- { NA_IPREFS_MAIN_TOOLBAR_FILE_DISPLAY, GROUP_NACT, FMA_DATA_TYPE_BOOLEAN, "true" },
- { NA_IPREFS_MAIN_TOOLBAR_HELP_DISPLAY, GROUP_NACT, FMA_DATA_TYPE_BOOLEAN, "true" },
- { NA_IPREFS_MAIN_TOOLBAR_TOOLS_DISPLAY, GROUP_NACT, FMA_DATA_TYPE_BOOLEAN, "false" },
- { NA_IPREFS_MAIN_WINDOW_WSP, GROUP_NACT, FMA_DATA_TYPE_UINT_LIST, "" },
- { NA_IPREFS_PREFERENCES_WSP, GROUP_NACT, FMA_DATA_TYPE_UINT_LIST, "" },
- { NA_IPREFS_PLUGIN_MENU_LOG, GROUP_RUNTIME, FMA_DATA_TYPE_BOOLEAN, "false" },
- { NA_IPREFS_RELABEL_DUPLICATE_ACTION, GROUP_NACT, FMA_DATA_TYPE_BOOLEAN, "false" },
- { NA_IPREFS_RELABEL_DUPLICATE_MENU, GROUP_NACT, FMA_DATA_TYPE_BOOLEAN, "false" },
- { NA_IPREFS_RELABEL_DUPLICATE_PROFILE, GROUP_NACT, FMA_DATA_TYPE_BOOLEAN, "false" },
- { NA_IPREFS_SCHEME_ADD_SCHEME_WSP, GROUP_NACT, FMA_DATA_TYPE_UINT_LIST, "" },
- { NA_IPREFS_SCHEME_DEFAULT_LIST, GROUP_NACT, FMA_DATA_TYPE_STRING_LIST, "" },
- { NA_IPREFS_TERMINAL_PATTERN, GROUP_RUNTIME, FMA_DATA_TYPE_STRING, "" },
- { NA_IPREFS_IO_PROVIDER_READABLE, NA_IPREFS_IO_PROVIDER_GROUP, FMA_DATA_TYPE_BOOLEAN,
"true" },
- { NA_IPREFS_IO_PROVIDER_WRITABLE, NA_IPREFS_IO_PROVIDER_GROUP, FMA_DATA_TYPE_BOOLEAN,
"true" },
+ { IPREFS_ADMIN_PREFERENCES_LOCKED, GROUP_NACT, FMA_DATA_TYPE_BOOLEAN, "false" },
+ { IPREFS_ADMIN_IO_PROVIDERS_LOCKED, GROUP_RUNTIME, FMA_DATA_TYPE_BOOLEAN, "false" },
+ { IPREFS_ASSISTANT_ESC_CONFIRM, GROUP_NACT, FMA_DATA_TYPE_BOOLEAN, "true" },
+ { IPREFS_ASSISTANT_ESC_QUIT, GROUP_NACT, FMA_DATA_TYPE_BOOLEAN, "true" },
+ { IPREFS_CAPABILITY_ADD_CAPABILITY_WSP, GROUP_NACT, FMA_DATA_TYPE_UINT_LIST, "" },
+ { IPREFS_COMMAND_CHOOSER_WSP, GROUP_NACT, FMA_DATA_TYPE_UINT_LIST, "" },
+ { IPREFS_COMMAND_CHOOSER_URI, GROUP_NACT, FMA_DATA_TYPE_STRING, "file:///bin" },
+ { IPREFS_COMMAND_LEGEND_WSP, GROUP_NACT, FMA_DATA_TYPE_UINT_LIST, "" },
+ { IPREFS_CONFIRM_LOGOUT_WSP, GROUP_NACT, FMA_DATA_TYPE_UINT_LIST, "" },
+ { IPREFS_DESKTOP_ENVIRONMENT, GROUP_RUNTIME, FMA_DATA_TYPE_STRING, "" },
+ { IPREFS_WORKING_DIR_WSP, GROUP_NACT, FMA_DATA_TYPE_UINT_LIST, "" },
+ { IPREFS_WORKING_DIR_URI, GROUP_NACT, FMA_DATA_TYPE_STRING, "file:///" },
+ { IPREFS_SHOW_IF_RUNNING_WSP, GROUP_NACT, FMA_DATA_TYPE_UINT_LIST, "" },
+ { IPREFS_SHOW_IF_RUNNING_URI, GROUP_NACT, FMA_DATA_TYPE_STRING, "file:///bin" },
+ { IPREFS_TRY_EXEC_WSP, GROUP_NACT, FMA_DATA_TYPE_UINT_LIST, "" },
+ { IPREFS_TRY_EXEC_URI, GROUP_NACT, FMA_DATA_TYPE_STRING, "file:///bin" },
+ { IPREFS_EXPORT_ASK_USER_WSP, GROUP_NACT, FMA_DATA_TYPE_UINT_LIST, "" },
+ { IPREFS_EXPORT_ASK_USER_LAST_FORMAT, GROUP_NACT, FMA_DATA_TYPE_STRING, "Desktop1" },
+ { IPREFS_EXPORT_ASK_USER_KEEP_LAST_CHOICE, GROUP_NACT, FMA_DATA_TYPE_BOOLEAN, "false" },
+ { IPREFS_EXPORT_ASSISTANT_WSP, GROUP_NACT, FMA_DATA_TYPE_UINT_LIST, "" },
+ { IPREFS_EXPORT_ASSISTANT_URI, GROUP_NACT, FMA_DATA_TYPE_STRING, "file:///tmp" },
+ { IPREFS_EXPORT_ASSISTANT_PANED, GROUP_NACT, FMA_DATA_TYPE_UINT, "200" },
+ { IPREFS_EXPORT_PREFERRED_FORMAT, GROUP_NACT, FMA_DATA_TYPE_STRING, "Ask" },
+ { IPREFS_FOLDER_CHOOSER_WSP, GROUP_NACT, FMA_DATA_TYPE_UINT_LIST, "" },
+ { IPREFS_FOLDER_CHOOSER_URI, GROUP_NACT, FMA_DATA_TYPE_STRING, "file:///" },
+ { IPREFS_IMPORT_ASK_USER_WSP, GROUP_NACT, FMA_DATA_TYPE_UINT_LIST, "" },
+ { IPREFS_IMPORT_ASK_USER_LAST_MODE, GROUP_NACT, FMA_DATA_TYPE_STRING, "NoImport" },
+ { IPREFS_IMPORT_ASSISTANT_WSP, GROUP_NACT, FMA_DATA_TYPE_UINT_LIST, "" },
+ { IPREFS_IMPORT_ASSISTANT_URI, GROUP_NACT, FMA_DATA_TYPE_STRING, "file:///tmp" },
+ { IPREFS_IMPORT_ASK_USER_KEEP_LAST_CHOICE, GROUP_NACT, FMA_DATA_TYPE_BOOLEAN, "false" },
+ { IPREFS_IMPORT_PREFERRED_MODE, GROUP_NACT, FMA_DATA_TYPE_STRING, "Ask" },
+ { IPREFS_IO_PROVIDERS_WRITE_ORDER, GROUP_NACT, FMA_DATA_TYPE_STRING_LIST, "" },
+ { IPREFS_ICON_CHOOSER_URI, GROUP_NACT, FMA_DATA_TYPE_STRING, "file:///" },
+ { IPREFS_ICON_CHOOSER_PANED, GROUP_NACT, FMA_DATA_TYPE_UINT, "200" },
+ { IPREFS_ICON_CHOOSER_WSP, GROUP_NACT, FMA_DATA_TYPE_UINT_LIST, "" },
+ { IPREFS_ITEMS_ADD_ABOUT_ITEM, GROUP_RUNTIME, FMA_DATA_TYPE_BOOLEAN, "true" },
+ { IPREFS_ITEMS_CREATE_ROOT_MENU, GROUP_RUNTIME, FMA_DATA_TYPE_BOOLEAN, "true" },
+ { IPREFS_ITEMS_LEVEL_ZERO_ORDER, GROUP_RUNTIME, FMA_DATA_TYPE_STRING_LIST, "" },
+ { IPREFS_ITEMS_LIST_ORDER_MODE, GROUP_RUNTIME, FMA_DATA_TYPE_STRING, "AscendingOrder"
},
+ { IPREFS_MAIN_PANED, GROUP_NACT, FMA_DATA_TYPE_UINT, "200" },
+ { IPREFS_MAIN_SAVE_AUTO, GROUP_NACT, FMA_DATA_TYPE_BOOLEAN, "false" },
+ { IPREFS_MAIN_SAVE_PERIOD, GROUP_NACT, FMA_DATA_TYPE_UINT, "5" },
+ { IPREFS_MAIN_TABS_POS, GROUP_NACT, FMA_DATA_TYPE_STRING, "Top" },
+ { IPREFS_MAIN_TOOLBAR_EDIT_DISPLAY, GROUP_NACT, FMA_DATA_TYPE_BOOLEAN, "true" },
+ { IPREFS_MAIN_TOOLBAR_FILE_DISPLAY, GROUP_NACT, FMA_DATA_TYPE_BOOLEAN, "true" },
+ { IPREFS_MAIN_TOOLBAR_HELP_DISPLAY, GROUP_NACT, FMA_DATA_TYPE_BOOLEAN, "true" },
+ { IPREFS_MAIN_TOOLBAR_TOOLS_DISPLAY, GROUP_NACT, FMA_DATA_TYPE_BOOLEAN, "false" },
+ { IPREFS_MAIN_WINDOW_WSP, GROUP_NACT, FMA_DATA_TYPE_UINT_LIST, "" },
+ { IPREFS_PREFERENCES_WSP, GROUP_NACT, FMA_DATA_TYPE_UINT_LIST, "" },
+ { IPREFS_PLUGIN_MENU_LOG, GROUP_RUNTIME, FMA_DATA_TYPE_BOOLEAN, "false" },
+ { IPREFS_RELABEL_DUPLICATE_ACTION, GROUP_NACT, FMA_DATA_TYPE_BOOLEAN, "false" },
+ { IPREFS_RELABEL_DUPLICATE_MENU, GROUP_NACT, FMA_DATA_TYPE_BOOLEAN, "false" },
+ { IPREFS_RELABEL_DUPLICATE_PROFILE, GROUP_NACT, FMA_DATA_TYPE_BOOLEAN, "false" },
+ { IPREFS_SCHEME_ADD_SCHEME_WSP, GROUP_NACT, FMA_DATA_TYPE_UINT_LIST, "" },
+ { IPREFS_SCHEME_DEFAULT_LIST, GROUP_NACT, FMA_DATA_TYPE_STRING_LIST, "" },
+ { IPREFS_TERMINAL_PATTERN, GROUP_RUNTIME, FMA_DATA_TYPE_STRING, "" },
+ { IPREFS_IO_PROVIDER_READABLE, IPREFS_IO_PROVIDER_GROUP, FMA_DATA_TYPE_BOOLEAN, "true" },
+ { IPREFS_IO_PROVIDER_WRITABLE, IPREFS_IO_PROVIDER_GROUP, FMA_DATA_TYPE_BOOLEAN, "true" },
{ 0 }
};
@@ -212,11 +212,11 @@ enum {
static GObjectClass *st_parent_class = NULL;
static gint st_burst_timeout = 100; /* burst timeout in msec */
static gint st_signals[ LAST_SIGNAL ] = { 0 };
-static NASettings *st_settings = NULL;
+static FMASettings *st_settings = NULL;
static GType settings_get_type( void );
static GType register_type( void );
-static void class_init( NASettingsClass *klass );
+static void class_init( FMASettingsClass *klass );
static void instance_init( GTypeInstance *instance, gpointer klass );
static void instance_dispose( GObject *object );
static void instance_finalize( GObject *object );
@@ -229,7 +229,7 @@ static KeyDef *get_key_def( const gchar *key );
static KeyFile *key_file_new( const gchar *dir );
static void on_keyfile_changed( GFileMonitor *monitor, GFile *file, GFile *other_file,
GFileMonitorEvent event_type );
static void on_keyfile_changed_timeout( void );
-static void on_key_changed_final_handler( NASettings *settings, gchar *group, gchar *key, FMABoxed
*new_value, gboolean mandatory );
+static void on_key_changed_final_handler( FMASettings *settings, gchar *group, gchar *key, FMABoxed
*new_value, gboolean mandatory );
static KeyValue *peek_key_value_from_content( GList *content, const gchar *group, const gchar *key );
static KeyValue *read_key_value( const gchar *group, const gchar *key, gboolean *found, gboolean *mandatory
);
static KeyValue *read_key_value_from_key_file( KeyFile *keyfile, const gchar *group, const gchar *key, const
KeyDef *key_def );
@@ -254,32 +254,32 @@ settings_get_type( void )
static GType
register_type( void )
{
- static const gchar *thisfn = "na_settings_register_type";
+ static const gchar *thisfn = "fma_settings_register_type";
GType type;
static GTypeInfo info = {
- sizeof( NASettingsClass ),
+ sizeof( FMASettingsClass ),
( GBaseInitFunc ) NULL,
( GBaseFinalizeFunc ) NULL,
( GClassInitFunc ) class_init,
NULL,
NULL,
- sizeof( NASettings ),
+ sizeof( FMASettings ),
0,
( GInstanceInitFunc ) instance_init
};
g_debug( "%s", thisfn );
- type = g_type_register_static( G_TYPE_OBJECT, "NASettings", &info, 0 );
+ type = g_type_register_static( G_TYPE_OBJECT, "FMASettings", &info, 0 );
return( type );
}
static void
-class_init( NASettingsClass *klass )
+class_init( FMASettingsClass *klass )
{
- static const gchar *thisfn = "na_settings_class_init";
+ static const gchar *thisfn = "fma_settings_class_init";
GObjectClass *object_class;
g_debug( "%s: klass=%p", thisfn, ( void * ) klass );
@@ -290,18 +290,18 @@ class_init( NASettingsClass *klass )
object_class->dispose = instance_dispose;
object_class->finalize = instance_finalize;
- klass->private = g_new0( NASettingsClassPrivate, 1 );
+ klass->private = g_new0( FMASettingsClassPrivate, 1 );
/*
- * NASettings::settings-key-changed:
+ * FMASettings::settings-key-changed:
*
- * This signal is sent by NASettings when the value of a key is modified.
+ * This signal is sent by FMASettings when the value of a key is modified.
*
* Arguments are the group, the key, the new value as a FMABoxed,
* and whether it is mandatory.
*
* Handler is of type:
- * void ( *handler )( NASettings *settings,
+ * void ( *handler )( FMASettings *settings,
* const gchar *group,
* const gchar *key,
* FMABoxed *value,
@@ -326,8 +326,8 @@ class_init( NASettingsClass *klass )
static void
instance_init( GTypeInstance *instance, gpointer klass )
{
- static const gchar *thisfn = "na_settings_instance_init";
- NASettings *self;
+ static const gchar *thisfn = "fma_settings_instance_init";
+ FMASettings *self;
g_return_if_fail( NA_IS_SETTINGS( instance ));
@@ -336,7 +336,7 @@ instance_init( GTypeInstance *instance, gpointer klass )
self = NA_SETTINGS( instance );
- self->private = g_new0( NASettingsPrivate, 1 );
+ self->private = g_new0( FMASettingsPrivate, 1 );
self->private->dispose_has_run = FALSE;
self->private->mandatory = NULL;
@@ -353,8 +353,8 @@ instance_init( GTypeInstance *instance, gpointer klass )
static void
instance_dispose( GObject *object )
{
- static const gchar *thisfn = "na_settings_instance_dispose";
- NASettings *self;
+ static const gchar *thisfn = "fma_settings_instance_dispose";
+ FMASettings *self;
g_return_if_fail( NA_IS_SETTINGS( object ));
@@ -378,8 +378,8 @@ instance_dispose( GObject *object )
static void
instance_finalize( GObject *object )
{
- static const gchar *thisfn = "na_settings_instance_finalize";
- NASettings *self;
+ static const gchar *thisfn = "fma_settings_instance_finalize";
+ FMASettings *self;
g_return_if_fail( NA_IS_SETTINGS( object ));
@@ -402,15 +402,15 @@ instance_finalize( GObject *object )
}
/**
- * na_settings_new:
+ * fma_settings_new:
*
- * Allocates a new #NASettings object which should be na_settings_free()
+ * Allocates a new #FMASettings object which should be fma_settings_free()
* by the caller.
*/
static void
settings_new( void )
{
- static const gchar *thisfn = "na_settings_new";
+ static const gchar *thisfn = "fma_settings_new";
gchar *dir;
GList *content;
const gchar * const *array;
@@ -455,10 +455,10 @@ settings_new( void )
}
/**
- * na_settings_free:
+ * fma_settings_free:
*/
void
-na_settings_free( void )
+fma_settings_free( void )
{
if( st_settings ){
g_object_unref( st_settings );
@@ -467,7 +467,7 @@ na_settings_free( void )
}
/**
- * na_settings_register_key_callback:
+ * fma_settings_register_key_callback:
* @key: the key to be monitored.
* @callback: the function to be called when the value of the key changes.
* @user_data: data to be passed to the @callback function.
@@ -477,9 +477,9 @@ na_settings_free( void )
* Since: 3.1
*/
void
-na_settings_register_key_callback( const gchar *key, GCallback callback, gpointer user_data )
+fma_settings_register_key_callback( const gchar *key, GCallback callback, gpointer user_data )
{
- static const gchar *thisfn = "na_settings_register_key_callback";
+ static const gchar *thisfn = "fma_settings_register_key_callback";
g_debug( "%s: key=%s, callback=%p, user_data=%p",
thisfn, key, ( void * ) callback, ( void * ) user_data );
@@ -494,7 +494,7 @@ na_settings_register_key_callback( const gchar *key, GCallback callback, gpointe
}
/**
- * na_settings_get_boolean:
+ * fma_settings_get_boolean:
* @key: the key whose value is to be returned.
* @found: if not %NULL, a pointer to a gboolean in which we will store
* whether the searched @key has been found (%TRUE), or if the returned
@@ -512,13 +512,13 @@ na_settings_register_key_callback( const gchar *key, GCallback callback, gpointe
* Since: 3.1
*/
gboolean
-na_settings_get_boolean( const gchar *key, gboolean *found, gboolean *mandatory )
+fma_settings_get_boolean( const gchar *key, gboolean *found, gboolean *mandatory )
{
- return( na_settings_get_boolean_ex( NULL, key, found, mandatory ));
+ return( fma_settings_get_boolean_ex( NULL, key, found, mandatory ));
}
/**
- * na_settings_get_boolean_ex:
+ * fma_settings_get_boolean_ex:
* @group: the group where the @key is to be searched for. May be %NULL.
* @key: the key whose value is to be returned.
* @found: if not %NULL, a pointer to a gboolean in which we will store
@@ -534,7 +534,7 @@ na_settings_get_boolean( const gchar *key, gboolean *found, gboolean *mandatory
* Since: 3.1
*/
gboolean
-na_settings_get_boolean_ex( const gchar *group, const gchar *key, gboolean *found, gboolean *mandatory )
+fma_settings_get_boolean_ex( const gchar *group, const gchar *key, gboolean *found, gboolean *mandatory )
{
gboolean value;
KeyValue *key_value;
@@ -558,7 +558,7 @@ na_settings_get_boolean_ex( const gchar *group, const gchar *key, gboolean *foun
}
/**
- * na_settings_get_string:
+ * fma_settings_get_string:
* @key: the key whose value is to be returned.
* @found: if not %NULL, a pointer to a gboolean in which we will store
* whether the searched @key has been found (%TRUE), or if the returned
@@ -577,7 +577,7 @@ na_settings_get_boolean_ex( const gchar *group, const gchar *key, gboolean *foun
* Since: 3.1
*/
gchar *
-na_settings_get_string( const gchar *key, gboolean *found, gboolean *mandatory )
+fma_settings_get_string( const gchar *key, gboolean *found, gboolean *mandatory )
{
gchar *value;
KeyValue *key_value;
@@ -601,7 +601,7 @@ na_settings_get_string( const gchar *key, gboolean *found, gboolean *mandatory )
}
/**
- * na_settings_get_string_list:
+ * fma_settings_get_string_list:
* @key: the key whose value is to be returned.
* @found: if not %NULL, a pointer to a gboolean in which we will store
* whether the searched @key has been found (%TRUE), or if the returned
@@ -620,7 +620,7 @@ na_settings_get_string( const gchar *key, gboolean *found, gboolean *mandatory )
* Since: 3.1
*/
GSList *
-na_settings_get_string_list( const gchar *key, gboolean *found, gboolean *mandatory )
+fma_settings_get_string_list( const gchar *key, gboolean *found, gboolean *mandatory )
{
GSList *value;
KeyValue *key_value;
@@ -644,7 +644,7 @@ na_settings_get_string_list( const gchar *key, gboolean *found, gboolean *mandat
}
/**
- * na_settings_get_uint:
+ * fma_settings_get_uint:
* @key: the key whose value is to be returned.
* @found: if not %NULL, a pointer to a gboolean in which we will store
* whether the searched @key has been found (%TRUE), or if the returned
@@ -662,7 +662,7 @@ na_settings_get_string_list( const gchar *key, gboolean *found, gboolean *mandat
* Since: 3.1
*/
guint
-na_settings_get_uint( const gchar *key, gboolean *found, gboolean *mandatory )
+fma_settings_get_uint( const gchar *key, gboolean *found, gboolean *mandatory )
{
guint value;
KeyDef *key_def;
@@ -686,7 +686,7 @@ na_settings_get_uint( const gchar *key, gboolean *found, gboolean *mandatory )
}
/**
- * na_settings_get_uint_list:
+ * fma_settings_get_uint_list:
* @key: the key whose value is to be returned.
* @found: if not %NULL, a pointer to a gboolean in which we will store
* whether the searched @key has been found (%TRUE), or if the returned
@@ -705,7 +705,7 @@ na_settings_get_uint( const gchar *key, gboolean *found, gboolean *mandatory )
* Since: 3.1
*/
GList *
-na_settings_get_uint_list( const gchar *key, gboolean *found, gboolean *mandatory )
+fma_settings_get_uint_list( const gchar *key, gboolean *found, gboolean *mandatory )
{
GList *value;
KeyDef *key_def;
@@ -729,7 +729,7 @@ na_settings_get_uint_list( const gchar *key, gboolean *found, gboolean *mandator
}
/**
- * na_settings_set_boolean:
+ * fma_settings_set_boolean:
* @key: the key whose value is to be returned.
* @value: the boolean to be written.
*
@@ -743,7 +743,7 @@ na_settings_get_uint_list( const gchar *key, gboolean *found, gboolean *mandator
* Since: 3.1
*/
gboolean
-na_settings_set_boolean( const gchar *key, gboolean value )
+fma_settings_set_boolean( const gchar *key, gboolean value )
{
gchar *string;
gboolean ok;
@@ -756,7 +756,7 @@ na_settings_set_boolean( const gchar *key, gboolean value )
}
/**
- * na_settings_set_boolean_ex:
+ * fma_settings_set_boolean_ex:
* @group: the group in the keyed file;
* @key: the key whose value is to be returned.
* @value: the boolean to be written.
@@ -768,7 +768,7 @@ na_settings_set_boolean( const gchar *key, gboolean value )
* Since: 3.1
*/
gboolean
-na_settings_set_boolean_ex( const gchar *group, const gchar *key, gboolean value )
+fma_settings_set_boolean_ex( const gchar *group, const gchar *key, gboolean value )
{
gchar *string;
gboolean ok;
@@ -781,7 +781,7 @@ na_settings_set_boolean_ex( const gchar *group, const gchar *key, gboolean value
}
/**
- * na_settings_set_string:
+ * fma_settings_set_string:
* @key: the key whose value is to be returned.
* @value: the string to be written.
*
@@ -795,13 +795,13 @@ na_settings_set_boolean_ex( const gchar *group, const gchar *key, gboolean value
* Since: 3.1
*/
gboolean
-na_settings_set_string( const gchar *key, const gchar *value )
+fma_settings_set_string( const gchar *key, const gchar *value )
{
return( set_key_value( NULL, key, value ));
}
/**
- * na_settings_set_string_ex:
+ * fma_settings_set_string_ex:
* @group: the group in the keyed file;
* @key: the key whose value is to be returned.
* @value: the string to be written.
@@ -813,13 +813,13 @@ na_settings_set_string( const gchar *key, const gchar *value )
* Since: 3.2
*/
gboolean
-na_settings_set_string_ex( const gchar *group, const gchar *key, const gchar *value )
+fma_settings_set_string_ex( const gchar *group, const gchar *key, const gchar *value )
{
return( set_key_value( group, key, value ));
}
/**
- * na_settings_set_string_list:
+ * fma_settings_set_string_list:
* @key: the key whose value is to be returned.
* @value: the list of strings to be written.
*
@@ -833,7 +833,7 @@ na_settings_set_string_ex( const gchar *group, const gchar *key, const gchar *va
* Since: 3.1
*/
gboolean
-na_settings_set_string_list( const gchar *key, const GSList *value )
+fma_settings_set_string_list( const gchar *key, const GSList *value )
{
GString *string;
const GSList *it;
@@ -850,7 +850,7 @@ na_settings_set_string_list( const gchar *key, const GSList *value )
}
/**
- * na_settings_set_int_ex:
+ * fma_settings_set_int_ex:
* @group: the group in the keyed file;
* @key: the key whose value is to be returned.
* @value: the unsigned integer to be written.
@@ -862,7 +862,7 @@ na_settings_set_string_list( const gchar *key, const GSList *value )
* Since: 3.2
*/
gboolean
-na_settings_set_int_ex( const gchar *group, const gchar *key, int value )
+fma_settings_set_int_ex( const gchar *group, const gchar *key, int value )
{
gchar *string;
gboolean ok;
@@ -875,7 +875,7 @@ na_settings_set_int_ex( const gchar *group, const gchar *key, int value )
}
/**
- * na_settings_set_uint:
+ * fma_settings_set_uint:
* @key: the key whose value is to be returned.
* @value: the unsigned integer to be written.
*
@@ -889,7 +889,7 @@ na_settings_set_int_ex( const gchar *group, const gchar *key, int value )
* Since: 3.1
*/
gboolean
-na_settings_set_uint( const gchar *key, guint value )
+fma_settings_set_uint( const gchar *key, guint value )
{
gchar *string;
gboolean ok;
@@ -902,7 +902,7 @@ na_settings_set_uint( const gchar *key, guint value )
}
/**
- * na_settings_set_uint_list:
+ * fma_settings_set_uint_list:
* @key: the key whose value is to be returned.
* @value: the list of unsigned integers to be written.
*
@@ -916,7 +916,7 @@ na_settings_set_uint( const gchar *key, guint value )
* Since: 3.1
*/
gboolean
-na_settings_set_uint_list( const gchar *key, const GList *value )
+fma_settings_set_uint_list( const gchar *key, const GList *value )
{
GString *string;
const GList *it;
@@ -933,7 +933,7 @@ na_settings_set_uint_list( const gchar *key, const GList *value )
}
/**
- * na_settings_get_groups:
+ * fma_settings_get_groups:
*
* Returns: the list of groups in the configuration; this list should be
* fma_core_utils_slist_free() by the caller.
@@ -945,7 +945,7 @@ na_settings_set_uint_list( const gchar *key, const GList *value )
* Since: 3.1
*/
GSList *
-na_settings_get_groups( void )
+fma_settings_get_groups( void )
{
GSList *groups;
gchar **array;
@@ -1050,7 +1050,7 @@ content_diff( GList *old, GList *new )
static GList *
content_load_keys( GList *content, KeyFile *keyfile )
{
- static const gchar *thisfn = "na_settings_content_load_keys";
+ static const gchar *thisfn = "fma_settings_content_load_keys";
GError *error;
gchar **groups, **ig;
gchar **keys, **ik;
@@ -1099,7 +1099,7 @@ content_load_keys( GList *content, KeyFile *keyfile )
static KeyDef *
get_key_def( const gchar *key )
{
- static const gchar *thisfn = "na_settings_get_key_def";
+ static const gchar *thisfn = "fma_settings_get_key_def";
KeyDef *found = NULL;
KeyDef *idef;
@@ -1118,13 +1118,13 @@ get_key_def( const gchar *key )
}
/*
- * called from na_settings_new
+ * called from fma_settings_new
* allocate and load the key files for global and user preferences
*/
static KeyFile *
key_file_new( const gchar *dir )
{
- static const gchar *thisfn = "na_settings_key_file_new";
+ static const gchar *thisfn = "fma_settings_key_file_new";
KeyFile *keyfile;
GError *error;
GFile *file;
@@ -1169,7 +1169,7 @@ on_keyfile_changed( GFileMonitor *monitor,
static void
on_keyfile_changed_timeout( void )
{
- static const gchar *thisfn = "na_settings_on_keyfile_changed_timeout";
+ static const gchar *thisfn = "fma_settings_on_keyfile_changed_timeout";
GList *new_content;
GList *modifs;
GList *ic, *im;
@@ -1208,15 +1208,15 @@ on_keyfile_changed_timeout( void )
consumer = ( const Consumer * ) ic->data;
group_prefix = NULL;
- if( !strcmp( consumer->monitored_key, NA_IPREFS_IO_PROVIDERS_READ_STATUS )){
- group_prefix = g_strdup_printf( "%s ", NA_IPREFS_IO_PROVIDER_GROUP );
- key = NA_IPREFS_IO_PROVIDER_READABLE;
+ if( !strcmp( consumer->monitored_key, IPREFS_IO_PROVIDERS_READ_STATUS )){
+ group_prefix = g_strdup_printf( "%s ", IPREFS_IO_PROVIDER_GROUP );
+ key = IPREFS_IO_PROVIDER_READABLE;
} else {
key = consumer->monitored_key;
}
if(( !group_prefix || g_str_has_prefix( changed->group, group_prefix )) && !strcmp(
changed->def->key, key )){
- ( *( NASettingsKeyCallback ) consumer->callback )(
+ ( *( FMASettingsKeyCallback ) consumer->callback )(
changed->group,
changed->def->key,
fma_boxed_get_pointer( changed->boxed ),
@@ -1244,9 +1244,9 @@ on_keyfile_changed_timeout( void )
}
static void
-on_key_changed_final_handler( NASettings *settings, gchar *group, gchar *key, FMABoxed *new_value, gboolean
mandatory )
+on_key_changed_final_handler( FMASettings *settings, gchar *group, gchar *key, FMABoxed *new_value, gboolean
mandatory )
{
- g_debug( "na_settings_on_key_changed_final_handler: group=%s, key=%s", group, key );
+ g_debug( "fma_settings_on_key_changed_final_handler: group=%s, key=%s", group, key );
fma_boxed_dump( new_value );
}
@@ -1272,7 +1272,7 @@ peek_key_value_from_content( GList *content, const gchar *group, const gchar *ke
static KeyValue *
read_key_value( const gchar *group, const gchar *key, gboolean *found, gboolean *mandatory )
{
- static const gchar *thisfn = "na_settings_read_key_value";
+ static const gchar *thisfn = "fma_settings_read_key_value";
KeyDef *key_def;
gboolean has_entry;
KeyValue *key_value;
@@ -1318,7 +1318,7 @@ read_key_value( const gchar *group, const gchar *key, gboolean *found, gboolean
static KeyValue *
read_key_value_from_key_file( KeyFile *keyfile, const gchar *group, const gchar *key, const KeyDef *key_def )
{
- static const gchar *thisfn = "na_settings_read_key_value_from_key_file";
+ static const gchar *thisfn = "fma_settings_read_key_value_from_key_file";
KeyValue *value;
gchar *str;
GError *error;
@@ -1418,7 +1418,7 @@ release_key_value( KeyValue *value )
static gboolean
set_key_value( const gchar *group, const gchar *key, const gchar *string )
{
- static const gchar *thisfn = "na_settings_set_key_value";
+ static const gchar *thisfn = "fma_settings_set_key_value";
KeyDef *key_def;
const gchar *wgroup;
gboolean ok;
@@ -1458,7 +1458,7 @@ set_key_value( const gchar *group, const gchar *key, const gchar *string )
static gboolean
write_user_key_file( void )
{
- static const gchar *thisfn = "na_settings_write_user_key_file";
+ static const gchar *thisfn = "fma_settings_write_user_key_file";
gchar *data;
GFile *file;
GFileOutputStream *stream;
diff --git a/src/core/fma-settings.h b/src/core/fma-settings.h
new file mode 100644
index 0000000..7b5dd6f
--- /dev/null
+++ b/src/core/fma-settings.h
@@ -0,0 +1,166 @@
+/*
+ * FileManager-Actions
+ * A file-manager extension which offers configurable context menu modules.
+ *
+ * Copyright (C) 2005 The GNOME Foundation
+ * Copyright (C) 2006-2008 Frederic Ruaudel and others (see AUTHORS)
+ * Copyright (C) 2009-2015 Pierre Wieser and others (see AUTHORS)
+ *
+ * FileManager-Actions is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * FileManager-Actions is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FileManager-Actions; see the file COPYING. If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ * Frederic Ruaudel <grumz grumz net>
+ * Rodrigo Moya <rodrigo gnome-db org>
+ * Pierre Wieser <pwieser trychlos org>
+ * ... and many others (see AUTHORS)
+ */
+
+#ifndef __CORE_FMA_SETTINGS_H__
+#define __CORE_FMA_SETTINGS_H__
+
+/* @title: FMASettings
+ * @short_description: The Settings Class Definition
+ * @include: core/fma-settings.h
+ *
+ * The #FMASettings class manages users preferences.
+ *
+ * Actual configuration may come from two sources:
+ * - a global configuration, which apply to all users, as read-only
+ * parameters;
+ * - a per-user configuration.
+ *
+ * The configuration is implemented as keyed files:
+ * - global configuration is sysconfdir/xdg/file-manager-actions/nautilus-actions.conf
+ * - per-user configuration is HOME/.config/file-manager-actions/nautilus-actions.conf
+ *
+ * Each setting may so have its own read-only attribute, whether it
+ * has been read from the global configuration or from the
+ * per-user one.
+ *
+ * FMASettings class monitors the whole configuration.
+ * A client may be informed of a modification of the value of a key either by
+ * pre-registering a callback on this key (see fma_settings_register_key_callback()
+ * function), or by connecting to and filtering the notification signal.
+ *
+ * #FMASettings class defines a singleton object, which allocates itself
+ * when needed
+ */
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+/* This is a composite key;
+ * by registering a callback on this key, a client may be informed of any
+ * modification regarding the readability status of the i/o providers.
+ */
+#define IPREFS_IO_PROVIDERS_READ_STATUS "io-providers-read-status-composite-key"
+
+/* other keys, mainly user preferences
+ */
+#define IPREFS_ADMIN_PREFERENCES_LOCKED "preferences-locked"
+#define IPREFS_ADMIN_IO_PROVIDERS_LOCKED "io-providers-locked"
+#define IPREFS_ASSISTANT_ESC_CONFIRM "assistant-esc-confirm"
+#define IPREFS_ASSISTANT_ESC_QUIT "assistant-esc-quit"
+#define IPREFS_CAPABILITY_ADD_CAPABILITY_WSP "capability-add-capability-wsp"
+#define IPREFS_COMMAND_CHOOSER_WSP "command-command-chooser-wsp"
+#define IPREFS_COMMAND_CHOOSER_URI "command-command-chooser-lfu"
+#define IPREFS_COMMAND_LEGEND_WSP "command-legend-wsp"
+#define IPREFS_DESKTOP_ENVIRONMENT "desktop-environment"
+#define IPREFS_CONFIRM_LOGOUT_WSP "confirm-logout-wsp"
+#define IPREFS_WORKING_DIR_WSP "command-working-dir-chooser-wsp"
+#define IPREFS_WORKING_DIR_URI "command-working-dir-chooser-lfu"
+#define IPREFS_SHOW_IF_RUNNING_WSP "environment-show-if-running-wsp"
+#define IPREFS_SHOW_IF_RUNNING_URI "environment-show-if-running-lfu"
+#define IPREFS_TRY_EXEC_WSP "environment-try-exec-wsp"
+#define IPREFS_TRY_EXEC_URI "environment-try-exec-lfu"
+#define IPREFS_EXPORT_ASK_USER_WSP "export-ask-user-wsp"
+#define IPREFS_EXPORT_ASK_USER_LAST_FORMAT "export-ask-user-last-format"
+#define IPREFS_EXPORT_ASK_USER_KEEP_LAST_CHOICE "export-ask-user-keep-last-choice"
+#define IPREFS_EXPORT_ASSISTANT_WSP "export-assistant-wsp"
+#define IPREFS_EXPORT_ASSISTANT_URI "export-assistant-lfu"
+#define IPREFS_EXPORT_ASSISTANT_PANED "export-assistant-paned-width"
+#define IPREFS_EXPORT_PREFERRED_FORMAT "export-preferred-format"
+#define IPREFS_FOLDER_CHOOSER_WSP "folder-chooser-wsp"
+#define IPREFS_FOLDER_CHOOSER_URI "folder-chooser-lfu"
+#define IPREFS_IMPORT_ASK_USER_WSP "import-ask-user-wsp"
+#define IPREFS_IMPORT_ASK_USER_LAST_MODE "import-ask-user-last-mode"
+#define IPREFS_IMPORT_ASSISTANT_WSP "import-assistant-wsp"
+#define IPREFS_IMPORT_ASSISTANT_URI "import-assistant-lfu"
+#define IPREFS_IMPORT_ASK_USER_KEEP_LAST_CHOICE "import-ask-user-keep-last-choice"
+#define IPREFS_IMPORT_PREFERRED_MODE "import-preferred-mode"
+#define IPREFS_ICON_CHOOSER_URI "item-icon-chooser-lfu"
+#define IPREFS_ICON_CHOOSER_PANED "item-icon-chooser-paned-width"
+#define IPREFS_ICON_CHOOSER_WSP "item-icon-chooser-wsp"
+#define IPREFS_IO_PROVIDERS_WRITE_ORDER "io-providers-write-order"
+#define IPREFS_ITEMS_ADD_ABOUT_ITEM "items-add-about-item"
+#define IPREFS_ITEMS_CREATE_ROOT_MENU "items-create-root-menu"
+#define IPREFS_ITEMS_LEVEL_ZERO_ORDER "items-level-zero-order"
+#define IPREFS_ITEMS_LIST_ORDER_MODE "items-list-order-mode"
+#define IPREFS_MAIN_PANED "main-paned-width"
+#define IPREFS_MAIN_SAVE_AUTO "main-save-auto"
+#define IPREFS_MAIN_SAVE_PERIOD "main-save-period"
+#define IPREFS_MAIN_TABS_POS "main-tabs-pos"
+#define IPREFS_MAIN_TOOLBAR_EDIT_DISPLAY "main-toolbar-edit-display"
+#define IPREFS_MAIN_TOOLBAR_FILE_DISPLAY "main-toolbar-file-display"
+#define IPREFS_MAIN_TOOLBAR_HELP_DISPLAY "main-toolbar-help-display"
+#define IPREFS_MAIN_TOOLBAR_TOOLS_DISPLAY "main-toolbar-tools-display"
+#define IPREFS_MAIN_WINDOW_WSP "main-window-wsp"
+#define IPREFS_PREFERENCES_WSP "preferences-wsp"
+#define IPREFS_PLUGIN_MENU_LOG "plugin-menu-log-enabled"
+#define IPREFS_RELABEL_DUPLICATE_ACTION "relabel-when-duplicate-action"
+#define IPREFS_RELABEL_DUPLICATE_MENU "relabel-when-duplicate-menu"
+#define IPREFS_RELABEL_DUPLICATE_PROFILE "relabel-when-duplicate-profile"
+#define IPREFS_SCHEME_ADD_SCHEME_WSP "scheme-add-scheme-wsp"
+#define IPREFS_SCHEME_DEFAULT_LIST "scheme-default-list"
+#define IPREFS_TERMINAL_PATTERN "terminal-pattern"
+
+#define IPREFS_IO_PROVIDER_GROUP "io-provider"
+#define IPREFS_IO_PROVIDER_READABLE "readable"
+#define IPREFS_IO_PROVIDER_WRITABLE "writable"
+
+/* pre-registration of a callback
+ */
+typedef void ( *FMASettingsKeyCallback )( const gchar *group, const gchar *key, gconstpointer new_value,
gboolean mandatory, void *user_data );
+
+void fma_settings_register_key_callback( const gchar *key, GCallback callback, gpointer user_data );
+
+/* signal sent when the value of a key changes
+ */
+#define SETTINGS_SIGNAL_KEY_CHANGED "settings-key-changed"
+
+void fma_settings_free ( void );
+
+gboolean fma_settings_get_boolean ( const gchar *key, gboolean *found, gboolean *mandatory );
+gboolean fma_settings_get_boolean_ex ( const gchar *group, const gchar *key, gboolean *found,
gboolean *mandatory );
+gchar *fma_settings_get_string ( const gchar *key, gboolean *found, gboolean *mandatory );
+GSList *fma_settings_get_string_list ( const gchar *key, gboolean *found, gboolean *mandatory );
+guint fma_settings_get_uint ( const gchar *key, gboolean *found, gboolean *mandatory );
+GList *fma_settings_get_uint_list ( const gchar *key, gboolean *found, gboolean *mandatory );
+
+gboolean fma_settings_set_boolean ( const gchar *key, gboolean value );
+gboolean fma_settings_set_boolean_ex ( const gchar *group, const gchar *key, gboolean value );
+gboolean fma_settings_set_string ( const gchar *key, const gchar *value );
+gboolean fma_settings_set_string_ex ( const gchar *group, const gchar *key, const gchar *value );
+gboolean fma_settings_set_string_list ( const gchar *key, const GSList *value );
+gboolean fma_settings_set_int_ex ( const gchar *group, const gchar *key, int value );
+gboolean fma_settings_set_uint ( const gchar *key, guint value );
+gboolean fma_settings_set_uint_list ( const gchar *key, const GList *value );
+
+GSList *fma_settings_get_groups ( void );
+
+G_END_DECLS
+
+#endif /* __CORE_FMA_SETTINGS_H__ */
diff --git a/src/core/na-marshal.def b/src/core/na-marshal.def
index b948079..d4e4ea6 100644
--- a/src/core/na-marshal.def
+++ b/src/core/na-marshal.def
@@ -2,5 +2,5 @@
# FMAIDuplicable:: IDUPLICABLE_SIGNAL_VALID_CHANGED
VOID:POINTER,BOOLEAN
#
-# NASettings:: SETTINGS_SIGNAL_KEY_CHANGED
+# FMASettings:: SETTINGS_SIGNAL_KEY_CHANGED
VOID:STRING,STRING,POINTER,BOOLEAN
diff --git a/src/core/na-tokens.c b/src/core/na-tokens.c
index e811426..e403960 100644
--- a/src/core/na-tokens.c
+++ b/src/core/na-tokens.c
@@ -41,7 +41,7 @@
#include "fma-gnome-vfs-uri.h"
#include "fma-selected-info.h"
-#include "na-settings.h"
+#include "fma-settings.h"
#include "na-tokens.h"
/* private class data
@@ -623,7 +623,7 @@ get_command_execution_terminal( const gchar *command )
gchar *run_command;
gchar *pattern;
- pattern = na_settings_get_string( NA_IPREFS_TERMINAL_PATTERN, NULL, NULL );
+ pattern = fma_settings_get_string( IPREFS_TERMINAL_PATTERN, NULL, NULL );
run_command = na_tokens_command_for_terminal( pattern, command );
g_free( pattern );
diff --git a/src/core/na-updater.c b/src/core/na-updater.c
index 8f67210..a9d43a6 100644
--- a/src/core/na-updater.c
+++ b/src/core/na-updater.c
@@ -36,7 +36,7 @@
#include <api/fma-object-api.h>
#include "fma-io-provider.h"
-#include "na-settings.h"
+#include "fma-settings.h"
#include "na-updater.h"
/* private class data
@@ -211,7 +211,7 @@ are_preferences_locked( const NAUpdater *updater )
gboolean are_locked;
gboolean mandatory;
- are_locked = na_settings_get_boolean( NA_IPREFS_ADMIN_PREFERENCES_LOCKED, NULL, &mandatory );
+ are_locked = fma_settings_get_boolean( IPREFS_ADMIN_PREFERENCES_LOCKED, NULL, &mandatory );
return( are_locked && mandatory );
}
@@ -222,11 +222,11 @@ is_level_zero_writable( const NAUpdater *updater )
GSList *level_zero;
gboolean mandatory;
- level_zero = na_settings_get_string_list( NA_IPREFS_ITEMS_LEVEL_ZERO_ORDER, NULL, &mandatory );
+ level_zero = fma_settings_get_string_list( IPREFS_ITEMS_LEVEL_ZERO_ORDER, NULL, &mandatory );
fma_core_utils_slist_free( level_zero );
- g_debug( "na_updater_is_level_zero_writable: NA_IPREFS_ITEMS_LEVEL_ZERO_ORDER: mandatory=%s",
+ g_debug( "na_updater_is_level_zero_writable: IPREFS_ITEMS_LEVEL_ZERO_ORDER: mandatory=%s",
mandatory ? "True":"False" );
return( !mandatory );
@@ -482,13 +482,13 @@ na_updater_should_pasted_be_relabeled( const NAUpdater *updater, const FMAObject
gboolean relabel;
if( FMA_IS_OBJECT_MENU( item )){
- relabel = na_settings_get_boolean( NA_IPREFS_RELABEL_DUPLICATE_MENU, NULL, NULL );
+ relabel = fma_settings_get_boolean( IPREFS_RELABEL_DUPLICATE_MENU, NULL, NULL );
} else if( FMA_IS_OBJECT_ACTION( item )){
- relabel = na_settings_get_boolean( NA_IPREFS_RELABEL_DUPLICATE_ACTION, NULL, NULL );
+ relabel = fma_settings_get_boolean( IPREFS_RELABEL_DUPLICATE_ACTION, NULL, NULL );
} else if( FMA_IS_OBJECT_PROFILE( item )){
- relabel = na_settings_get_boolean( NA_IPREFS_RELABEL_DUPLICATE_PROFILE, NULL, NULL );
+ relabel = fma_settings_get_boolean( IPREFS_RELABEL_DUPLICATE_PROFILE, NULL, NULL );
} else {
g_warning( "%s: unknown item type at %p", thisfn, ( void * ) item );
diff --git a/src/nact/base-gtk-utils.c b/src/nact/base-gtk-utils.c
index b5cae56..0a7a9fb 100644
--- a/src/nact/base-gtk-utils.c
+++ b/src/nact/base-gtk-utils.c
@@ -413,7 +413,7 @@ base_gtk_utils_select_file_with_preview( GtkApplicationWindow *window,
gtk_file_chooser_set_filename( GTK_FILE_CHOOSER( dialog ), text );
} else {
- uri = na_settings_get_string( entry_name, NULL, NULL );
+ uri = fma_settings_get_string( entry_name, NULL, NULL );
if( uri ){
gtk_file_chooser_set_current_folder_uri( GTK_FILE_CHOOSER( dialog ), uri );
g_free( uri );
@@ -427,7 +427,7 @@ base_gtk_utils_select_file_with_preview( GtkApplicationWindow *window,
}
uri = gtk_file_chooser_get_current_folder_uri( GTK_FILE_CHOOSER( dialog ));
- na_settings_set_string( entry_name, uri );
+ fma_settings_set_string( entry_name, uri );
g_free( uri );
fma_gtk_utils_save_window_position( GTK_WINDOW( dialog ), wsp_name );
@@ -480,7 +480,7 @@ base_gtk_utils_select_dir( GtkApplicationWindow *window,
gtk_file_chooser_set_filename( GTK_FILE_CHOOSER( dialog ), text );
} else {
- uri = na_settings_get_string( entry_name, NULL, NULL );
+ uri = fma_settings_get_string( entry_name, NULL, NULL );
if( uri ){
gtk_file_chooser_set_current_folder_uri( GTK_FILE_CHOOSER( dialog ), uri );
g_free( uri );
@@ -494,7 +494,7 @@ base_gtk_utils_select_dir( GtkApplicationWindow *window,
}
uri = gtk_file_chooser_get_current_folder_uri( GTK_FILE_CHOOSER( dialog ));
- na_settings_set_string( entry_name, uri );
+ fma_settings_set_string( entry_name, uri );
g_free( uri );
fma_gtk_utils_save_window_position( GTK_WINDOW( dialog ), wsp_name );
diff --git a/src/nact/nact-add-capability-dialog.c b/src/nact/nact-add-capability-dialog.c
index 40fc421..b2f2203 100644
--- a/src/nact/nact-add-capability-dialog.c
+++ b/src/nact/nact-add-capability-dialog.c
@@ -37,7 +37,7 @@
#include <api/fma-core-utils.h>
-#include <core/na-settings.h>
+#include <core/fma-settings.h>
#include "nact-add-capability-dialog.h"
@@ -81,7 +81,7 @@ static CapabilityTextStruct st_caps[] = {
static const gchar *st_xmlui_filename = PKGUIDIR "/nact-add-capability.ui";
static const gchar *st_toplevel_name = "AddCapabilityDialog";
-static const gchar *st_wsp_name = NA_IPREFS_CAPABILITY_ADD_CAPABILITY_WSP;
+static const gchar *st_wsp_name = IPREFS_CAPABILITY_ADD_CAPABILITY_WSP;
static GObjectClass *st_parent_class = NULL;
diff --git a/src/nact/nact-add-scheme-dialog.c b/src/nact/nact-add-scheme-dialog.c
index cf15182..ad3f856 100644
--- a/src/nact/nact-add-scheme-dialog.c
+++ b/src/nact/nact-add-scheme-dialog.c
@@ -35,7 +35,7 @@
#include "api/fma-core-utils.h"
-#include "core/na-settings.h"
+#include "core/fma-settings.h"
#include "nact-schemes-list.h"
#include "nact-add-scheme-dialog.h"
@@ -51,7 +51,7 @@ struct _NactAddSchemeDialogPrivate {
static const gchar *st_xmlui_filename = PKGUIDIR "/nact-add-scheme.ui";
static const gchar *st_toplevel_name = "AddSchemeDialog";
-static const gchar *st_wsp_name = NA_IPREFS_SCHEME_ADD_SCHEME_WSP;
+static const gchar *st_wsp_name = IPREFS_SCHEME_ADD_SCHEME_WSP;
static GObjectClass *st_parent_class = NULL;
diff --git a/src/nact/nact-assistant-export.c b/src/nact/nact-assistant-export.c
index 1a9c003..65b4c9b 100644
--- a/src/nact/nact-assistant-export.c
+++ b/src/nact/nact-assistant-export.c
@@ -90,7 +90,7 @@ typedef struct {
static const gchar *st_xmlui_filename = PKGUIDIR "/nact-assistant-export.ui";
static const gchar *st_toplevel_name = "ExportAssistant";
-static const gchar *st_wsp_name = NA_IPREFS_EXPORT_ASSISTANT_WSP;
+static const gchar *st_wsp_name = IPREFS_EXPORT_ASSISTANT_WSP;
static BaseAssistantClass *st_parent_class = NULL;
@@ -312,7 +312,7 @@ instance_dispose( GObject *window )
page = gtk_assistant_get_nth_page( assistant, ASSIST_PAGE_ACTIONS_SELECTION );
pane = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( page ), "p1-paned" );
pos = gtk_paned_get_position( GTK_PANED( pane ));
- na_settings_set_uint( NA_IPREFS_EXPORT_ASSISTANT_PANED, pos );
+ fma_settings_set_uint( IPREFS_EXPORT_ASSISTANT_PANED, pos );
/* chain up to the parent class */
if( G_OBJECT_CLASS( st_parent_class )->dispose ){
@@ -357,8 +357,8 @@ nact_assistant_export_run( NactMainWindow *main_window )
g_return_if_fail( NACT_IS_MAIN_WINDOW( main_window ));
- esc_quit = na_settings_get_boolean( NA_IPREFS_ASSISTANT_ESC_QUIT, NULL, NULL );
- esc_confirm = na_settings_get_boolean( NA_IPREFS_ASSISTANT_ESC_CONFIRM, NULL, NULL );
+ esc_quit = fma_settings_get_boolean( IPREFS_ASSISTANT_ESC_QUIT, NULL, NULL );
+ esc_confirm = fma_settings_get_boolean( IPREFS_ASSISTANT_ESC_CONFIRM, NULL, NULL );
assistant = g_object_new( NACT_TYPE_ASSISTANT_EXPORT,
BASE_PROP_MAIN_WINDOW, main_window,
@@ -389,7 +389,7 @@ on_base_initialize_gtk_toplevel( NactAssistantExport *window, GtkAssistant *assi
folder_chooser_initialize_gtk( window );
format_tree_view_initialize_gtk( window );
- are_locked = na_settings_get_boolean( NA_IPREFS_ADMIN_PREFERENCES_LOCKED, NULL, &mandatory );
+ are_locked = fma_settings_get_boolean( IPREFS_ADMIN_PREFERENCES_LOCKED, NULL, &mandatory );
window->private->preferences_locked = are_locked && mandatory;
}
}
@@ -433,7 +433,7 @@ folder_chooser_initialize_gtk( NactAssistantExport *window )
gtk_file_chooser_set_create_folders( GTK_FILE_CHOOSER( chooser ), TRUE );
gtk_file_chooser_set_select_multiple( GTK_FILE_CHOOSER( chooser ), FALSE );
- uri = na_settings_get_string( NA_IPREFS_EXPORT_ASSISTANT_URI, NULL, NULL );
+ uri = fma_settings_get_string( IPREFS_EXPORT_ASSISTANT_URI, NULL, NULL );
if( uri && strlen( uri )){
gtk_file_chooser_set_current_folder_uri( GTK_FILE_CHOOSER( chooser ), uri );
}
@@ -490,7 +490,7 @@ on_base_initialize_base_window( NactAssistantExport *window, void *empty )
/* set the slider position of the item selection page
*/
- pos = na_settings_get_uint( NA_IPREFS_EXPORT_ASSISTANT_PANED, NULL, NULL );
+ pos = fma_settings_get_uint( IPREFS_EXPORT_ASSISTANT_PANED, NULL, NULL );
if( pos ){
page = gtk_assistant_get_nth_page( assistant, ASSIST_PAGE_ACTIONS_SELECTION );
pane = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( page ), "p1-paned" );
@@ -501,7 +501,7 @@ on_base_initialize_base_window( NactAssistantExport *window, void *empty )
*/
page = gtk_assistant_get_nth_page( assistant, ASSIST_PAGE_FORMAT_SELECTION );
tree_view = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( page ),
"p3-ExportFormatTreeView" );
- format = na_settings_get_string( NA_IPREFS_EXPORT_PREFERRED_FORMAT, NULL, &mandatory );
+ format = fma_settings_get_string( IPREFS_EXPORT_PREFERRED_FORMAT, NULL, &mandatory );
fma_ioptions_list_set_editable(
FMA_IOPTIONS_LIST( window ), tree_view,
!mandatory && !window->private->preferences_locked );
@@ -622,7 +622,7 @@ on_folder_chooser_selection_changed( GtkFileChooser *chooser, NactAssistantExpor
if( enabled ){
g_free( window->private->uri );
window->private->uri = g_strdup( uri );
- na_settings_set_string( NA_IPREFS_EXPORT_ASSISTANT_URI, uri );
+ fma_settings_set_string( IPREFS_EXPORT_ASSISTANT_URI, uri );
}
g_free( uri );
@@ -736,7 +736,7 @@ assist_prepare_confirm( NactAssistantExport *window, GtkAssistant *assistant, Gt
g_free( format_description2 );
format_id = fma_ioption_get_id( format );
- na_settings_set_string( NA_IPREFS_EXPORT_PREFERRED_FORMAT, format_id );
+ fma_settings_set_string( IPREFS_EXPORT_PREFERRED_FORMAT, format_id );
g_free( format_id );
gtk_assistant_set_page_complete( assistant, page, TRUE );
@@ -775,7 +775,7 @@ assistant_apply( BaseAssistant *wnd, GtkAssistant *assistant )
window->private->results = g_list_append( window->private->results, str );
str->item = FMA_OBJECT_ITEM( fma_object_get_origin( FMA_IDUPLICABLE( ia->data )));
- str->format = na_settings_get_string( NA_IPREFS_EXPORT_PREFERRED_FORMAT, NULL, NULL );
+ str->format = fma_settings_get_string( IPREFS_EXPORT_PREFERRED_FORMAT, NULL, NULL );
g_return_if_fail( str->format && strlen( str->format ));
if( !strcmp( str->format, EXPORTER_FORMAT_ASK )){
diff --git a/src/nact/nact-assistant-import.c b/src/nact/nact-assistant-import.c
index 2f8101a..86b1dbf 100644
--- a/src/nact/nact-assistant-import.c
+++ b/src/nact/nact-assistant-import.c
@@ -42,7 +42,7 @@
#include <core/fma-importer.h>
#include <core/fma-ioptions-list.h>
#include <core/fma-gtk-utils.h>
-#include <core/na-settings.h>
+#include <core/fma-settings.h>
#include "nact-application.h"
#include "nact-assistant-import.h"
@@ -91,7 +91,7 @@ struct _NactAssistantImportPrivate {
static const gchar *st_xmlui_filename = PKGUIDIR "/nact-assistant-import.ui";
static const gchar *st_toplevel_name = "ImportAssistant";
-static const gchar *st_wsp_name = NA_IPREFS_IMPORT_ASSISTANT_WSP;
+static const gchar *st_wsp_name = IPREFS_IMPORT_ASSISTANT_WSP;
static BaseAssistantClass *st_parent_class = NULL;
@@ -316,8 +316,8 @@ nact_assistant_import_run( NactMainWindow *main_window )
g_return_if_fail( NACT_IS_MAIN_WINDOW( main_window ));
- esc_quit = na_settings_get_boolean( NA_IPREFS_ASSISTANT_ESC_QUIT, NULL, NULL );
- esc_confirm = na_settings_get_boolean( NA_IPREFS_ASSISTANT_ESC_CONFIRM, NULL, NULL );
+ esc_quit = fma_settings_get_boolean( IPREFS_ASSISTANT_ESC_QUIT, NULL, NULL );
+ esc_confirm = fma_settings_get_boolean( IPREFS_ASSISTANT_ESC_CONFIRM, NULL, NULL );
assistant = g_object_new( NACT_TYPE_ASSISTANT_IMPORT,
BASE_PROP_MAIN_WINDOW, main_window,
@@ -438,7 +438,7 @@ runtime_init_file_selector( NactAssistantImport *window, GtkAssistant *assistant
thisfn, ( void * ) window, ( void * ) assistant, ( void * ) page, ( void * ) chooser
);
- uri = na_settings_get_string( NA_IPREFS_IMPORT_ASSISTANT_URI, NULL, NULL );
+ uri = fma_settings_get_string( IPREFS_IMPORT_ASSISTANT_URI, NULL, NULL );
if( uri && strlen( uri )){
gtk_file_chooser_set_current_folder_uri( GTK_FILE_CHOOSER( chooser ), uri );
}
@@ -483,7 +483,7 @@ on_file_selection_changed( GtkFileChooser *chooser, gpointer user_data )
folder = gtk_file_chooser_get_current_folder_uri( GTK_FILE_CHOOSER( chooser ));
g_debug( "%s: current folder uri=%s", thisfn, folder );
if( folder && strlen( folder )){
- na_settings_set_string( NA_IPREFS_IMPORT_ASSISTANT_URI, folder );
+ fma_settings_set_string( IPREFS_IMPORT_ASSISTANT_URI, folder );
}
g_free( folder );
}
@@ -534,7 +534,7 @@ runtime_init_duplicates( NactAssistantImport *window, GtkAssistant *assistant )
g_debug( "%s: window=%p, assistant=%p",
thisfn, ( void * ) window, ( void * ) assistant );
- import_mode = na_settings_get_string( NA_IPREFS_IMPORT_PREFERRED_MODE, NULL, &mandatory );
+ import_mode = fma_settings_get_string( IPREFS_IMPORT_PREFERRED_MODE, NULL, &mandatory );
fma_ioptions_list_set_editable(
FMA_IOPTIONS_LIST( window ), GTK_WIDGET( window->private->duplicates_listview ),
!mandatory );
@@ -832,7 +832,7 @@ prepare_importdone( NactAssistantImport *window, GtkAssistant *assistant, GtkWid
}
mode_id = fma_ioption_get_id( window->private->mode );
- na_settings_set_string( NA_IPREFS_IMPORT_PREFERRED_MODE, mode_id );
+ fma_settings_set_string( IPREFS_IMPORT_PREFERRED_MODE, mode_id );
g_free( mode_id );
/* release here our reference on overriding items
diff --git a/src/nact/nact-clipboard.c b/src/nact/nact-clipboard.c
index 70676c7..56e25d2 100644
--- a/src/nact/nact-clipboard.c
+++ b/src/nact/nact-clipboard.c
@@ -616,7 +616,7 @@ export_row_object( NactClipboard *clipboard, FMAObject *object, const gchar *des
g_free( item_label );
*exported = g_list_prepend( *exported, ( gpointer ) item );
- format = na_settings_get_string( NA_IPREFS_EXPORT_PREFERRED_FORMAT, NULL, NULL );
+ format = fma_settings_get_string( IPREFS_EXPORT_PREFERRED_FORMAT, NULL, NULL );
g_return_val_if_fail( format && strlen( format ), NULL );
if( !strcmp( format, EXPORTER_FORMAT_ASK )){
diff --git a/src/nact/nact-confirm-logout.c b/src/nact/nact-confirm-logout.c
index 628520d..6c8a08c 100644
--- a/src/nact/nact-confirm-logout.c
+++ b/src/nact/nact-confirm-logout.c
@@ -31,7 +31,7 @@
#include <config.h>
#endif
-#include "core/na-settings.h"
+#include "core/fma-settings.h"
#include "nact-confirm-logout.h"
#include "nact-main-window-def.h"
@@ -52,7 +52,7 @@ enum {
static const gchar *st_xmlui_filename = PKGUIDIR "/nact-confirm-logout.ui";
static const gchar *st_toplevel_name = "ConfirmLogoutDialog";
-static const gchar *st_wsp_name = NA_IPREFS_CONFIRM_LOGOUT_WSP;
+static const gchar *st_wsp_name = IPREFS_CONFIRM_LOGOUT_WSP;
static BaseDialogClass *st_parent_class = NULL;
diff --git a/src/nact/nact-export-ask.c b/src/nact/nact-export-ask.c
index 382cc00..66d1ac8 100644
--- a/src/nact/nact-export-ask.c
+++ b/src/nact/nact-export-ask.c
@@ -59,7 +59,7 @@ struct _NactExportAskPrivate {
static const gchar *st_xmlui_filename = PKGUIDIR "/nact-export-ask.ui";
static const gchar *st_toplevel_name = "ExportAskDialog";
-static const gchar *st_wsp_name = NA_IPREFS_EXPORT_ASK_USER_WSP;
+static const gchar *st_wsp_name = IPREFS_EXPORT_ASK_USER_WSP;
static BaseDialogClass *st_parent_class = NULL;
@@ -286,7 +286,7 @@ instance_finalize( GObject *dialog )
*
* Returns: the export format chosen by the user as a newly allocated
* string which should be g_free() by the caller.
- * The function defaults to returning NA_IPREFS_DEFAULT_EXPORT_FORMAT.
+ * The function defaults to returning IPREFS_DEFAULT_EXPORT_FORMAT.
*
* When the user selects 'Keep same choice without asking me', this choice
* becomes his new preferred export format.
@@ -306,8 +306,8 @@ nact_export_ask_user( FMAObjectItem *item, gboolean first )
( void * ) item, G_OBJECT_TYPE_NAME( item ),
first ? "True":"False" );
- format = na_settings_get_string( NA_IPREFS_EXPORT_ASK_USER_LAST_FORMAT, NULL, &mandatory );
- keep = na_settings_get_boolean( NA_IPREFS_EXPORT_ASK_USER_KEEP_LAST_CHOICE, NULL, &keep_mandatory );
+ format = fma_settings_get_string( IPREFS_EXPORT_ASK_USER_LAST_FORMAT, NULL, &mandatory );
+ keep = fma_settings_get_boolean( IPREFS_EXPORT_ASK_USER_KEEP_LAST_CHOICE, NULL, &keep_mandatory );
if( first || !keep ){
editor = g_object_new( NACT_TYPE_EXPORT_ASK,
@@ -322,7 +322,7 @@ nact_export_ask_user( FMAObjectItem *item, gboolean first )
editor->private->keep_last_choice_mandatory = keep_mandatory;
editor->private->item = item;
- are_locked = na_settings_get_boolean( NA_IPREFS_ADMIN_PREFERENCES_LOCKED, NULL, &mandatory );
+ are_locked = fma_settings_get_boolean( IPREFS_ADMIN_PREFERENCES_LOCKED, NULL, &mandatory );
editor->private->preferences_locked = are_locked && mandatory;
code = base_window_run( BASE_WINDOW( editor ));
@@ -475,11 +475,11 @@ get_export_format( NactExportAsk *editor )
g_return_val_if_fail( FMA_IS_EXPORT_FORMAT( format ), 0 );
if( !editor->private->keep_last_choice_mandatory ){
- na_settings_set_boolean( NA_IPREFS_EXPORT_ASK_USER_KEEP_LAST_CHOICE,
editor->private->keep_last_choice );
+ fma_settings_set_boolean( IPREFS_EXPORT_ASK_USER_KEEP_LAST_CHOICE,
editor->private->keep_last_choice );
}
format_id = fma_ioption_get_id( format );
- na_settings_set_string( NA_IPREFS_EXPORT_ASK_USER_LAST_FORMAT, format_id );
+ fma_settings_set_string( IPREFS_EXPORT_ASK_USER_LAST_FORMAT, format_id );
return( format_id );
}
diff --git a/src/nact/nact-icommand-tab.c b/src/nact/nact-icommand-tab.c
index 293bc84..7676808 100644
--- a/src/nact/nact-icommand-tab.c
+++ b/src/nact/nact-icommand-tab.c
@@ -440,7 +440,7 @@ legend_dialog_hide( NactICommandTab *instance )
}
if( is_visible ){
- base_gtk_utils_save_window_position( BASE_WINDOW( instance ), NA_IPREFS_COMMAND_LEGEND_WSP );
+ base_gtk_utils_save_window_position( BASE_WINDOW( instance ), IPREFS_COMMAND_LEGEND_WSP );
gtk_widget_hide( GTK_WIDGET( legend_dialog ));
/* set the legend button state consistent for when the dialog is
@@ -463,7 +463,7 @@ legend_dialog_show( NactICommandTab *instance )
gtk_window_set_transient_for( GTK_WINDOW( legend_dialog ), GTK_WINDOW( instance ));
- base_gtk_utils_restore_window_position( BASE_WINDOW( instance ), NA_IPREFS_COMMAND_LEGEND_WSP );
+ base_gtk_utils_restore_window_position( BASE_WINDOW( instance ), 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 ));
@@ -540,8 +540,8 @@ on_path_browse( GtkButton *button, NactICommandTab *instance )
{
base_gtk_utils_select_file(
GTK_APPLICATION_WINDOW( instance ),
- _( "Choosing a command" ), NA_IPREFS_COMMAND_CHOOSER_WSP,
- get_path_entry( instance ), NA_IPREFS_COMMAND_CHOOSER_URI );
+ _( "Choosing a command" ), IPREFS_COMMAND_CHOOSER_WSP,
+ get_path_entry( instance ), IPREFS_COMMAND_CHOOSER_URI );
}
static void
@@ -583,9 +583,9 @@ on_wdir_browse( GtkButton *button, NactICommandTab *instance )
base_gtk_utils_select_dir(
GTK_APPLICATION_WINDOW( instance ),
_( "Choosing a working directory" ),
- NA_IPREFS_WORKING_DIR_WSP,
+ IPREFS_WORKING_DIR_WSP,
wdir_entry,
- NA_IPREFS_WORKING_DIR_URI );
+ IPREFS_WORKING_DIR_URI );
}
}
diff --git a/src/nact/nact-icon-chooser.c b/src/nact/nact-icon-chooser.c
index 1fb553b..410eb44 100644
--- a/src/nact/nact-icon-chooser.c
+++ b/src/nact/nact-icon-chooser.c
@@ -91,7 +91,7 @@ enum {
static const gchar *st_xmlui_filename = PKGUIDIR "/nact-icon-chooser.ui";
static const gchar *st_toplevel_name = "IconChooserDialog";
-static const gchar *st_wsp_name = NA_IPREFS_ICON_CHOOSER_WSP;
+static const gchar *st_wsp_name = IPREFS_ICON_CHOOSER_WSP;
static BaseDialogClass *st_parent_class = NULL;
@@ -262,7 +262,7 @@ instance_dispose( GObject *dialog )
paned = base_window_get_widget( BASE_WINDOW( self ), "IconPaned" );
pos = gtk_paned_get_position( GTK_PANED( paned ));
- na_settings_set_uint( NA_IPREFS_ICON_CHOOSER_PANED, pos );
+ fma_settings_set_uint( IPREFS_ICON_CHOOSER_PANED, pos );
/* chain up to the parent class */
if( G_OBJECT_CLASS( st_parent_class )->dispose ){
@@ -451,7 +451,7 @@ on_base_initialize_window( NactIconChooser *editor, gpointer user_data )
g_debug( "%s: dialog=%p, user_data=%p", thisfn, ( void * ) editor, ( void * ) user_data );
- pos = na_settings_get_uint( NA_IPREFS_ICON_CHOOSER_PANED, NULL, NULL );
+ pos = fma_settings_get_uint( IPREFS_ICON_CHOOSER_PANED, NULL, NULL );
if( pos ){
paned = base_window_get_widget( BASE_WINDOW( editor ), "IconPaned" );
gtk_paned_set_position( GTK_PANED( paned ), pos );
@@ -543,7 +543,7 @@ fillup_icons_by_path( NactIconChooser *editor )
gtk_file_chooser_unselect_all( file_chooser );
- uri = na_settings_get_string( NA_IPREFS_ICON_CHOOSER_URI, NULL, NULL );
+ uri = fma_settings_get_string( IPREFS_ICON_CHOOSER_URI, NULL, NULL );
if( uri ){
gtk_file_chooser_set_current_folder_uri( file_chooser, uri );
g_free( uri );
@@ -845,7 +845,7 @@ on_path_selection_changed( GtkFileChooser *file_chooser, NactIconChooser *editor
uri = gtk_file_chooser_get_current_folder_uri( file_chooser );
if( uri ){
- na_settings_set_string( NA_IPREFS_ICON_CHOOSER_URI, uri );
+ fma_settings_set_string( IPREFS_ICON_CHOOSER_URI, uri );
g_free( uri );
}
}
diff --git a/src/nact/nact-ienvironment-tab.c b/src/nact/nact-ienvironment-tab.c
index 66dbf92..de8a6d3 100644
--- a/src/nact/nact-ienvironment-tab.c
+++ b/src/nact/nact-ienvironment-tab.c
@@ -41,7 +41,7 @@
#include "core/fma-gtk-utils.h"
#include "core/fma-desktop-environment.h"
-#include "core/na-settings.h"
+#include "core/fma-settings.h"
#include "base-gtk-utils.h"
#include "nact-main-tab.h"
@@ -727,8 +727,8 @@ on_try_exec_browse( GtkButton *button, NactIEnvironmentTab *instance )
base_gtk_utils_select_file(
GTK_APPLICATION_WINDOW( instance ),
- _( "Choosing an executable" ), NA_IPREFS_TRY_EXEC_WSP,
- entry, NA_IPREFS_TRY_EXEC_URI );
+ _( "Choosing an executable" ), IPREFS_TRY_EXEC_WSP,
+ entry, IPREFS_TRY_EXEC_URI );
}
static void
@@ -785,8 +785,8 @@ on_show_if_running_browse( GtkButton *button, NactIEnvironmentTab *instance )
base_gtk_utils_select_file(
GTK_APPLICATION_WINDOW( instance ),
- _( "Choosing an executable" ), NA_IPREFS_SHOW_IF_RUNNING_WSP,
- entry, NA_IPREFS_SHOW_IF_RUNNING_URI );
+ _( "Choosing an executable" ), IPREFS_SHOW_IF_RUNNING_WSP,
+ entry, IPREFS_SHOW_IF_RUNNING_URI );
}
static void
diff --git a/src/nact/nact-ifolders-tab.c b/src/nact/nact-ifolders-tab.c
index c95bbcc..0b5a429 100644
--- a/src/nact/nact-ifolders-tab.c
+++ b/src/nact/nact-ifolders-tab.c
@@ -248,9 +248,9 @@ on_browse_folder_clicked( GtkButton *button, NactIFoldersTab *instance )
_( "_Open" ), GTK_RESPONSE_ACCEPT,
NULL );
- fma_gtk_utils_restore_window_position( GTK_WINDOW( dialog ), NA_IPREFS_FOLDER_CHOOSER_WSP );
+ fma_gtk_utils_restore_window_position( GTK_WINDOW( dialog ), IPREFS_FOLDER_CHOOSER_WSP );
- uri = na_settings_get_string( NA_IPREFS_FOLDER_CHOOSER_URI, NULL, NULL );
+ uri = fma_settings_get_string( IPREFS_FOLDER_CHOOSER_URI, NULL, NULL );
if( uri && g_utf8_strlen( uri, -1 )){
gtk_file_chooser_set_current_folder_uri( GTK_FILE_CHOOSER( dialog ), uri );
}
@@ -258,14 +258,14 @@ on_browse_folder_clicked( GtkButton *button, NactIFoldersTab *instance )
if( gtk_dialog_run( GTK_DIALOG( dialog )) == GTK_RESPONSE_ACCEPT ){
uri = gtk_file_chooser_get_current_folder_uri( GTK_FILE_CHOOSER( dialog ));
- na_settings_set_string( NA_IPREFS_FOLDER_CHOOSER_URI, uri );
+ fma_settings_set_string( IPREFS_FOLDER_CHOOSER_URI, uri );
path = g_filename_from_uri( uri, NULL, NULL );
nact_match_list_insert_row( NACT_MAIN_WINDOW( instance ), ITAB_NAME, path, FALSE, FALSE );
g_free( path );
g_free( uri );
}
- fma_gtk_utils_restore_window_position( GTK_WINDOW( dialog ), NA_IPREFS_FOLDER_CHOOSER_WSP );
+ fma_gtk_utils_restore_window_position( GTK_WINDOW( dialog ), IPREFS_FOLDER_CHOOSER_WSP );
gtk_widget_destroy( dialog );
}
diff --git a/src/nact/nact-main-window.c b/src/nact/nact-main-window.c
index e6196b9..df595d9 100644
--- a/src/nact/nact-main-window.c
+++ b/src/nact/nact-main-window.c
@@ -147,7 +147,7 @@ enum {
static const gchar *st_xmlui_filename = PKGUIDIR "/nact-main-window.ui";
static const gchar *st_toplevel_name = "MainWindow";
-static const gchar *st_wsp_name = NA_IPREFS_MAIN_WINDOW_WSP;
+static const gchar *st_wsp_name = IPREFS_MAIN_WINDOW_WSP;
static gint st_burst_timeout = 2500; /* burst timeout in msec */
static BaseWindowClass *st_parent_class = NULL;
@@ -616,7 +616,7 @@ instance_dispose( GObject *window )
pane = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( window ), "main-paned" );
pos = gtk_paned_get_position( GTK_PANED( pane ));
- na_settings_set_uint( NA_IPREFS_MAIN_PANED, pos );
+ fma_settings_set_uint( IPREFS_MAIN_PANED, pos );
notebook = GTK_NOTEBOOK( fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( window ),
"main-notebook" ));
pos = gtk_notebook_get_tab_pos( notebook );
@@ -737,7 +737,7 @@ setup_main_ui( NactMainWindow *main_window )
/* restore pane position
*/
- pos = na_settings_get_uint( NA_IPREFS_MAIN_PANED, NULL, NULL );
+ pos = fma_settings_get_uint( IPREFS_MAIN_PANED, NULL, NULL );
if( pos ){
pane = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( top_widget ), "main-paned" );
g_return_if_fail( pane && GTK_IS_PANED( pane ));
diff --git a/src/nact/nact-menu-file.c b/src/nact/nact-menu-file.c
index 0b212d8..46a4780 100644
--- a/src/nact/nact-menu-file.c
+++ b/src/nact/nact-menu-file.c
@@ -383,8 +383,8 @@ install_autosave( NactMainWindow *main_window )
st_autosave_prefs_timeout.handler = ( FMATimeoutFunc ) on_autosave_prefs_timeout;
st_autosave_prefs_timeout.user_data = main_window;
- na_settings_register_key_callback( NA_IPREFS_MAIN_SAVE_AUTO, G_CALLBACK( on_autosave_prefs_changed ),
NULL );
- na_settings_register_key_callback( NA_IPREFS_MAIN_SAVE_PERIOD, G_CALLBACK( on_autosave_prefs_changed
), NULL );
+ fma_settings_register_key_callback( IPREFS_MAIN_SAVE_AUTO, G_CALLBACK( on_autosave_prefs_changed ),
NULL );
+ fma_settings_register_key_callback( IPREFS_MAIN_SAVE_PERIOD, G_CALLBACK( on_autosave_prefs_changed ),
NULL );
on_autosave_prefs_timeout( main_window );
}
@@ -402,8 +402,8 @@ on_autosave_prefs_timeout( NactMainWindow *main_window )
gboolean autosave_on;
guint autosave_period;
- autosave_on = na_settings_get_boolean( NA_IPREFS_MAIN_SAVE_AUTO, NULL, NULL );
- autosave_period = na_settings_get_uint( NA_IPREFS_MAIN_SAVE_PERIOD, NULL, NULL );
+ autosave_on = fma_settings_get_boolean( IPREFS_MAIN_SAVE_AUTO, NULL, NULL );
+ autosave_period = fma_settings_get_uint( IPREFS_MAIN_SAVE_PERIOD, NULL, NULL );
if( st_event_autosave ){
if( !g_source_remove( st_event_autosave )){
diff --git a/src/nact/nact-menu-view.c b/src/nact/nact-menu-view.c
index 436faf9..73e4547 100644
--- a/src/nact/nact-menu-view.c
+++ b/src/nact/nact-menu-view.c
@@ -50,10 +50,10 @@ typedef struct {
sToolbarProps;
static sToolbarProps st_toolbar_props[] = {
- { TOOLBAR_FILE_ID, NA_IPREFS_MAIN_TOOLBAR_FILE_DISPLAY, "toolbar-file", "file-toolbar", NULL },
- { TOOLBAR_EDIT_ID, NA_IPREFS_MAIN_TOOLBAR_EDIT_DISPLAY, "toolbar-edit", "edit-toolbar", NULL },
- { TOOLBAR_TOOLS_ID, NA_IPREFS_MAIN_TOOLBAR_TOOLS_DISPLAY, "toolbar-tools", "tools-toolbar", NULL },
- { TOOLBAR_HELP_ID, NA_IPREFS_MAIN_TOOLBAR_HELP_DISPLAY, "toolbar-help", "help-toolbar", NULL }
+ { TOOLBAR_FILE_ID, IPREFS_MAIN_TOOLBAR_FILE_DISPLAY, "toolbar-file", "file-toolbar", NULL },
+ { TOOLBAR_EDIT_ID, IPREFS_MAIN_TOOLBAR_EDIT_DISPLAY, "toolbar-edit", "edit-toolbar", NULL },
+ { TOOLBAR_TOOLS_ID, IPREFS_MAIN_TOOLBAR_TOOLS_DISPLAY, "toolbar-tools", "tools-toolbar", NULL },
+ { TOOLBAR_HELP_ID, IPREFS_MAIN_TOOLBAR_HELP_DISPLAY, "toolbar-help", "help-toolbar", NULL }
};
static const gchar *st_toolbar_ui = PKGUIDIR "/nact-toolbar.ui";
@@ -157,7 +157,7 @@ setup_toolbar( NactMainWindow *window, GtkBuilder *builder, guint toolbar_id )
g_return_if_fail( props->toolbar && GTK_IS_TOOLBAR( props->toolbar ));
/* display the toolbar depending it is active or not */
- is_active = na_settings_get_boolean( props->prefs_key, NULL, NULL );
+ is_active = fma_settings_get_boolean( props->prefs_key, NULL, NULL );
if( is_active ){
action = g_action_map_lookup_action( G_ACTION_MAP( window ), props->action_name );
g_action_change_state( action, g_variant_new_boolean( is_active ));
@@ -206,7 +206,7 @@ nact_menu_view_toolbar_display( NactMainWindow *main_window, const gchar *action
}
gtk_widget_show_all( parent );
- na_settings_set_boolean( props->prefs_key, visible );
+ fma_settings_set_boolean( props->prefs_key, visible );
}
static sToolbarProps *
diff --git a/src/nact/nact-preferences-editor.c b/src/nact/nact-preferences-editor.c
index 4edf481..ae19cac 100644
--- a/src/nact/nact-preferences-editor.c
+++ b/src/nact/nact-preferences-editor.c
@@ -120,7 +120,7 @@ static const FMADesktopEnv st_no_desktop = { "None", N_( "Rely on runtime de
#define st_xmlui_filename PKGUIDIR "/nact-preferences.ui"
static const gchar *st_toplevel_name = "PreferencesDialog";
-static const gchar *st_wsp_name = NA_IPREFS_PREFERENCES_WSP;
+static const gchar *st_wsp_name = IPREFS_PREFERENCES_WSP;
static GObjectClass *st_parent_class = NULL;
static guint st_last_tab = 0;
@@ -459,7 +459,7 @@ nact_preferences_editor_run( NactMainWindow *parent )
BASE_PROP_WSP_NAME, st_wsp_name,
NULL );
- are_locked = na_settings_get_boolean( NA_IPREFS_ADMIN_PREFERENCES_LOCKED, NULL, &mandatory );
+ are_locked = fma_settings_get_boolean( IPREFS_ADMIN_PREFERENCES_LOCKED, NULL, &mandatory );
editor->private->preferences_locked = are_locked && mandatory;
g_debug( "%s: are_locked=%s, mandatory=%s",
thisfn, are_locked ? "True":"False", mandatory ? "True":"False" );
@@ -545,7 +545,7 @@ on_base_initialize_window( NactPreferencesEditor *editor, gpointer user_data )
/* fourth tab: import mode
*/
container = base_window_get_widget( BASE_WINDOW( editor ), "PreferencesImportModeVBox" );
- import_mode = na_settings_get_string( NA_IPREFS_IMPORT_PREFERRED_MODE, NULL,
&editor->private->import_mode_mandatory );
+ import_mode = fma_settings_get_string( IPREFS_IMPORT_PREFERRED_MODE, NULL,
&editor->private->import_mode_mandatory );
fma_ioptions_list_set_editable(
FMA_IOPTIONS_LIST( editor ), container,
!editor->private->import_mode_mandatory &&
!editor->private->preferences_locked );
@@ -557,7 +557,7 @@ on_base_initialize_window( NactPreferencesEditor *editor, gpointer user_data )
/* fifth tab: export format
*/
container = base_window_get_widget( BASE_WINDOW( editor ), "PreferencesExportFormatVBox" );
- export_format = na_settings_get_string( NA_IPREFS_EXPORT_PREFERRED_FORMAT, NULL,
&editor->private->export_format_mandatory );
+ export_format = fma_settings_get_string( IPREFS_EXPORT_PREFERRED_FORMAT, NULL,
&editor->private->export_format_mandatory );
fma_ioptions_list_set_editable(
FMA_IOPTIONS_LIST( editor ), container,
!editor->private->export_format_mandatory &&
!editor->private->preferences_locked );
@@ -702,7 +702,7 @@ root_menu_setup( NactPreferencesEditor *editor )
{
gboolean editable;
- editor->private->root_menu = na_settings_get_boolean( NA_IPREFS_ITEMS_CREATE_ROOT_MENU, NULL,
&editor->private->root_menu_mandatory );
+ editor->private->root_menu = fma_settings_get_boolean( IPREFS_ITEMS_CREATE_ROOT_MENU, NULL,
&editor->private->root_menu_mandatory );
editable = !editor->private->preferences_locked && !editor->private->root_menu_mandatory;
base_gtk_utils_toggle_set_initial_state( BASE_WINDOW( editor ),
@@ -736,7 +736,7 @@ about_item_setup( NactPreferencesEditor *editor )
{
gboolean editable;
- editor->private->about_item = na_settings_get_boolean( NA_IPREFS_ITEMS_ADD_ABOUT_ITEM, NULL,
&editor->private->about_item_mandatory );
+ editor->private->about_item = fma_settings_get_boolean( IPREFS_ITEMS_ADD_ABOUT_ITEM, NULL,
&editor->private->about_item_mandatory );
editable = !editor->private->preferences_locked && !editor->private->about_item_mandatory;
base_gtk_utils_toggle_set_initial_state( BASE_WINDOW( editor ),
@@ -781,7 +781,7 @@ terminal_pattern_setup( NactPreferencesEditor *editor )
gboolean editable;
GtkWidget *entry;
- editor->private->terminal_pattern = na_settings_get_string( NA_IPREFS_TERMINAL_PATTERN, NULL,
&editor->private->terminal_pattern_mandatory );
+ editor->private->terminal_pattern = fma_settings_get_string( IPREFS_TERMINAL_PATTERN, NULL,
&editor->private->terminal_pattern_mandatory );
editable = !editor->private->preferences_locked && !editor->private->terminal_pattern_mandatory;
entry = base_window_get_widget( BASE_WINDOW( editor ), "TerminalPrefixEntry" );
@@ -887,7 +887,7 @@ desktop_setup( NactPreferencesEditor *editor )
const gchar *desktop_label;
found = -1;
- editor->private->desktop = na_settings_get_string( NA_IPREFS_DESKTOP_ENVIRONMENT, NULL,
&editor->private->desktop_mandatory );
+ editor->private->desktop = fma_settings_get_string( IPREFS_DESKTOP_ENVIRONMENT, NULL,
&editor->private->desktop_mandatory );
if( editor->private->desktop && strlen( editor->private->desktop )){
desktops = fma_desktop_environment_get_known_list();
@@ -950,7 +950,7 @@ relabel_menu_setup( NactPreferencesEditor *editor )
{
gboolean editable;
- editor->private->relabel_menu = na_settings_get_boolean( NA_IPREFS_RELABEL_DUPLICATE_MENU, NULL,
&editor->private->relabel_menu_mandatory );
+ editor->private->relabel_menu = fma_settings_get_boolean( IPREFS_RELABEL_DUPLICATE_MENU, NULL,
&editor->private->relabel_menu_mandatory );
editable = !editor->private->preferences_locked && !editor->private->relabel_menu_mandatory;
base_gtk_utils_toggle_set_initial_state( BASE_WINDOW( editor ),
@@ -981,7 +981,7 @@ relabel_action_setup( NactPreferencesEditor *editor )
{
gboolean editable;
- editor->private->relabel_action = na_settings_get_boolean( NA_IPREFS_RELABEL_DUPLICATE_ACTION, NULL,
&editor->private->relabel_action_mandatory );
+ editor->private->relabel_action = fma_settings_get_boolean( IPREFS_RELABEL_DUPLICATE_ACTION, NULL,
&editor->private->relabel_action_mandatory );
editable = !editor->private->preferences_locked && !editor->private->relabel_action_mandatory;
base_gtk_utils_toggle_set_initial_state( BASE_WINDOW( editor ),
@@ -1012,7 +1012,7 @@ relabel_profile_setup( NactPreferencesEditor *editor )
{
gboolean editable;
- editor->private->relabel_profile = na_settings_get_boolean( NA_IPREFS_RELABEL_DUPLICATE_PROFILE,
NULL, &editor->private->relabel_profile_mandatory );
+ editor->private->relabel_profile = fma_settings_get_boolean( IPREFS_RELABEL_DUPLICATE_PROFILE, NULL,
&editor->private->relabel_profile_mandatory );
editable = !editor->private->preferences_locked && !editor->private->relabel_profile_mandatory;
base_gtk_utils_toggle_set_initial_state( BASE_WINDOW( editor ),
@@ -1043,7 +1043,7 @@ esc_quit_setup( NactPreferencesEditor *editor )
{
gboolean editable;
- editor->private->esc_quit = na_settings_get_boolean( NA_IPREFS_ASSISTANT_ESC_QUIT, NULL,
&editor->private->esc_quit_mandatory );
+ editor->private->esc_quit = fma_settings_get_boolean( IPREFS_ASSISTANT_ESC_QUIT, NULL,
&editor->private->esc_quit_mandatory );
editable = !editor->private->preferences_locked && !editor->private->esc_quit_mandatory;
base_gtk_utils_toggle_set_initial_state( BASE_WINDOW( editor ),
@@ -1078,7 +1078,7 @@ esc_confirm_setup( NactPreferencesEditor *editor )
{
gboolean editable;
- editor->private->esc_confirm = na_settings_get_boolean( NA_IPREFS_ASSISTANT_ESC_CONFIRM, NULL,
&editor->private->esc_confirm_mandatory );
+ editor->private->esc_confirm = fma_settings_get_boolean( IPREFS_ASSISTANT_ESC_CONFIRM, NULL,
&editor->private->esc_confirm_mandatory );
editable = !editor->private->preferences_locked && !editor->private->esc_confirm_mandatory;
base_gtk_utils_toggle_set_initial_state( BASE_WINDOW( editor ),
@@ -1112,10 +1112,10 @@ auto_save_setup( NactPreferencesEditor *editor )
GtkAdjustment *adjustment;
g_debug( "nact_preferences_editor_auto_save_setup" );
- editor->private->auto_save = na_settings_get_boolean( NA_IPREFS_MAIN_SAVE_AUTO, NULL,
&editor->private->auto_save_mandatory );
+ editor->private->auto_save = fma_settings_get_boolean( IPREFS_MAIN_SAVE_AUTO, NULL,
&editor->private->auto_save_mandatory );
editable = !editor->private->preferences_locked && !editor->private->auto_save_mandatory;
- editor->private->auto_save_period = na_settings_get_uint( NA_IPREFS_MAIN_SAVE_PERIOD, NULL,
&editor->private->auto_save_period_mandatory );
+ editor->private->auto_save_period = fma_settings_get_uint( IPREFS_MAIN_SAVE_PERIOD, NULL,
&editor->private->auto_save_period_mandatory );
spin_button = base_window_get_widget( BASE_WINDOW( editor ), "AutoSavePeriodicitySpinButton" );
adjustment = gtk_spin_button_get_adjustment( GTK_SPIN_BUTTON( spin_button ));
gtk_adjustment_configure( adjustment, editor->private->auto_save_period, 1, 999, 1, 10, 0 );
@@ -1201,43 +1201,43 @@ on_dialog_ok( BaseDialog *dialog )
fma_iprefs_set_order_mode( editor->private->order_mode );
}
if( !editor->private->root_menu_mandatory ){
- na_settings_set_boolean( NA_IPREFS_ITEMS_CREATE_ROOT_MENU, editor->private->root_menu
);
+ fma_settings_set_boolean( IPREFS_ITEMS_CREATE_ROOT_MENU, editor->private->root_menu );
}
if( !editor->private->about_item_mandatory ){
- na_settings_set_boolean( NA_IPREFS_ITEMS_ADD_ABOUT_ITEM, editor->private->about_item
);
+ fma_settings_set_boolean( IPREFS_ITEMS_ADD_ABOUT_ITEM, editor->private->about_item );
}
/* second tab: runtime execution
*/
if( !editor->private->terminal_pattern_mandatory ){
- na_settings_set_string( NA_IPREFS_TERMINAL_PATTERN, editor->private->terminal_pattern
);
+ fma_settings_set_string( IPREFS_TERMINAL_PATTERN, editor->private->terminal_pattern );
}
if( !editor->private->desktop_mandatory ){
- na_settings_set_string( NA_IPREFS_DESKTOP_ENVIRONMENT, editor->private->desktop );
+ fma_settings_set_string( IPREFS_DESKTOP_ENVIRONMENT, editor->private->desktop );
}
/* third tab: ui preferences
*/
if( !editor->private->relabel_menu_mandatory ){
- na_settings_set_boolean( NA_IPREFS_RELABEL_DUPLICATE_MENU,
editor->private->relabel_menu );
+ fma_settings_set_boolean( IPREFS_RELABEL_DUPLICATE_MENU,
editor->private->relabel_menu );
}
if( !editor->private->relabel_action_mandatory ){
- na_settings_set_boolean( NA_IPREFS_RELABEL_DUPLICATE_ACTION,
editor->private->relabel_action );
+ fma_settings_set_boolean( IPREFS_RELABEL_DUPLICATE_ACTION,
editor->private->relabel_action );
}
if( !editor->private->relabel_profile_mandatory ){
- na_settings_set_boolean( NA_IPREFS_RELABEL_DUPLICATE_PROFILE,
editor->private->relabel_profile );
+ fma_settings_set_boolean( IPREFS_RELABEL_DUPLICATE_PROFILE,
editor->private->relabel_profile );
}
if( !editor->private->esc_quit_mandatory ){
- na_settings_set_boolean( NA_IPREFS_ASSISTANT_ESC_QUIT, editor->private->esc_quit );
+ fma_settings_set_boolean( IPREFS_ASSISTANT_ESC_QUIT, editor->private->esc_quit );
}
if( !editor->private->esc_confirm_mandatory ){
- na_settings_set_boolean( NA_IPREFS_ASSISTANT_ESC_CONFIRM,
editor->private->esc_confirm );
+ fma_settings_set_boolean( IPREFS_ASSISTANT_ESC_CONFIRM, editor->private->esc_confirm
);
}
if( !editor->private->auto_save_mandatory ){
- na_settings_set_boolean( NA_IPREFS_MAIN_SAVE_AUTO, editor->private->auto_save );
+ fma_settings_set_boolean( IPREFS_MAIN_SAVE_AUTO, editor->private->auto_save );
}
if( !editor->private->auto_save_period_mandatory ){
- na_settings_set_uint( NA_IPREFS_MAIN_SAVE_PERIOD, editor->private->auto_save_period );
+ fma_settings_set_uint( IPREFS_MAIN_SAVE_PERIOD, editor->private->auto_save_period );
}
/* fourth tab: import mode
@@ -1247,7 +1247,7 @@ on_dialog_ok( BaseDialog *dialog )
option = fma_ioptions_list_get_selected( FMA_IOPTIONS_LIST( editor ), container );
g_return_if_fail( FMA_IS_IMPORT_MODE( option ));
import_mode = fma_ioption_get_id( option );
- na_settings_set_string( NA_IPREFS_IMPORT_PREFERRED_MODE, import_mode );
+ fma_settings_set_string( IPREFS_IMPORT_PREFERRED_MODE, import_mode );
g_free( import_mode );
}
@@ -1259,7 +1259,7 @@ on_dialog_ok( BaseDialog *dialog )
g_debug( "nact_preferences_editor_on_dialog_ok: option=%p", ( void * ) option );
g_return_if_fail( FMA_IS_EXPORT_FORMAT( option ));
export_format = fma_ioption_get_id( option );
- na_settings_set_string( NA_IPREFS_EXPORT_PREFERRED_FORMAT, export_format );
+ fma_settings_set_string( IPREFS_EXPORT_PREFERRED_FORMAT, export_format );
g_free( export_format );
}
diff --git a/src/nact/nact-providers-list.c b/src/nact/nact-providers-list.c
index 7ec6c45..3155264 100644
--- a/src/nact/nact-providers-list.c
+++ b/src/nact/nact-providers-list.c
@@ -364,7 +364,7 @@ nact_providers_list_save( BaseWindow *window )
gtk_tree_model_foreach( model, ( GtkTreeModelForeachFunc ) providers_list_save_iter, plsd );
plsd->order = g_slist_reverse( plsd->order );
- na_settings_set_string_list( NA_IPREFS_IO_PROVIDERS_WRITE_ORDER, plsd->order );
+ fma_settings_set_string_list( IPREFS_IO_PROVIDERS_WRITE_ORDER, plsd->order );
fma_core_utils_slist_free( plsd->order );
g_free( plsd );
@@ -385,9 +385,9 @@ providers_list_save_iter( GtkTreeModel *model, GtkTreePath *path, GtkTreeIter* i
PROVIDER_PROVIDER_COLUMN, &provider,
-1 );
- group = g_strdup_printf( "%s %s", NA_IPREFS_IO_PROVIDER_GROUP, id );
- na_settings_set_boolean_ex( group, NA_IPREFS_IO_PROVIDER_READABLE, readable );
- na_settings_set_boolean_ex( group, NA_IPREFS_IO_PROVIDER_WRITABLE, writable );
+ group = g_strdup_printf( "%s %s", IPREFS_IO_PROVIDER_GROUP, id );
+ fma_settings_set_boolean_ex( group, IPREFS_IO_PROVIDER_READABLE, readable );
+ fma_settings_set_boolean_ex( group, IPREFS_IO_PROVIDER_WRITABLE, writable );
g_free( group );
plsd->order = g_slist_prepend( plsd->order, g_strdup( id ));
diff --git a/src/nact/nact-schemes-list.c b/src/nact/nact-schemes-list.c
index 6fc0842..d862628 100644
--- a/src/nact/nact-schemes-list.c
+++ b/src/nact/nact-schemes-list.c
@@ -263,7 +263,7 @@ init_view_get_default_list( SchemesListData *data )
GSList *list = NULL;
gboolean mandatory;
- list = na_settings_get_string_list( NA_IPREFS_SCHEME_DEFAULT_LIST, NULL, &mandatory );
+ list = fma_settings_get_string_list( IPREFS_SCHEME_DEFAULT_LIST, NULL, &mandatory );
if( !list ){
list = init_view_get_default_default_list( data );
}
@@ -485,7 +485,7 @@ nact_schemes_list_save_defaults( BaseWindow *window )
treeview = GTK_TREE_VIEW( g_object_get_data( G_OBJECT( window ), SCHEMES_LIST_TREEVIEW ));
schemes = get_list_schemes( treeview );
- na_settings_set_string_list( NA_IPREFS_SCHEME_DEFAULT_LIST, schemes );
+ fma_settings_set_string_list( IPREFS_SCHEME_DEFAULT_LIST, schemes );
fma_core_utils_slist_free( schemes );
}
diff --git a/src/nact/nact-sort-buttons.c b/src/nact/nact-sort-buttons.c
index 3e3be9f..cb0ad39 100644
--- a/src/nact/nact-sort-buttons.c
+++ b/src/nact/nact-sort-buttons.c
@@ -248,8 +248,8 @@ initialize_buttons( NactSortButtons *buttons, NactMainWindow *window )
G_CALLBACK( on_toggle_button_toggled ), buttons );
}
- na_settings_register_key_callback(
- NA_IPREFS_ITEMS_LIST_ORDER_MODE, G_CALLBACK( on_settings_order_mode_changed ),
buttons );
+ fma_settings_register_key_callback(
+ IPREFS_ITEMS_LIST_ORDER_MODE, G_CALLBACK( on_settings_order_mode_changed ), buttons );
/* for now, disable the sort buttons
* they will be enabled as soon as we receive the count of displayed items
@@ -294,13 +294,13 @@ on_toggle_button_toggled( GtkToggleButton *toggled_button, NactSortButtons *butt
}
/*
- * NASettings callback for a change on NA_IPREFS_ITEMS_LIST_ORDER_MODE key
+ * FMASettings callback for a change on IPREFS_ITEMS_LIST_ORDER_MODE key
*
* activate the button corresponding to the new sort order
* desactivate the previous button
* do nothing if new button and previous button are the sames
*
- * testing 'toggling' is useless here because NASettings slightly delay the
+ * testing 'toggling' is useless here because FMASettings slightly delay the
* notifications: when we toggle a button, and update the settings, then
* we already have reset 'toggling' to FALSE when we are coming here
*/
diff --git a/src/nact/nact-tree-model.c b/src/nact/nact-tree-model.c
index 3517f9f..f9b1d4f 100644
--- a/src/nact/nact-tree-model.c
+++ b/src/nact/nact-tree-model.c
@@ -299,8 +299,8 @@ instance_constructed( GObject *model )
G_CALLBACK( nact_tree_model_dnd_on_drag_end ), priv->window );
/* set_edition_mode */
- na_settings_register_key_callback(
- NA_IPREFS_ITEMS_LIST_ORDER_MODE,
+ fma_settings_register_key_callback(
+ IPREFS_ITEMS_LIST_ORDER_MODE,
G_CALLBACK( on_settings_order_mode_changed ),
model );
@@ -460,8 +460,8 @@ nact_tree_model_set_edition_mode( NactTreeModel *tmodel, guint mode )
if( priv->mode == TREE_MODE_EDITION ){
- na_settings_register_key_callback(
- NA_IPREFS_ITEMS_LIST_ORDER_MODE,
+ fma_settings_register_key_callback(
+ IPREFS_ITEMS_LIST_ORDER_MODE,
G_CALLBACK( on_settings_order_mode_changed ),
tmodel );
@@ -497,7 +497,7 @@ connect_item_updated_signal( NactTreeModel *tmodel )
}
/*
- * NASettings callback for a change on NA_IPREFS_ITEMS_LIST_ORDER_MODE key
+ * FMASettings callback for a change on IPREFS_ITEMS_LIST_ORDER_MODE key
*/
static void
on_settings_order_mode_changed( const gchar *group, const gchar *key, gconstpointer new_value, gboolean
mandatory, NactTreeModel *model )
diff --git a/src/plugin-menu/nautilus-actions.c b/src/plugin-menu/nautilus-actions.c
index 248c1a5..f39365a 100644
--- a/src/plugin-menu/nautilus-actions.c
+++ b/src/plugin-menu/nautilus-actions.c
@@ -194,7 +194,7 @@ instance_init( GTypeInstance *instance, gpointer klass )
*
* - whether to add the 'About FileManager-Actions' item
* - whether to create a 'FileManager-Actions actions' root menu
- * > registering for notifications against NASettings
+ * > registering for notifications against FMASettings
*/
static void
instance_constructed( GObject *object )
@@ -230,33 +230,33 @@ instance_constructed( GObject *object )
G_CALLBACK( on_pivot_items_changed_handler ),
object );
- /* register against NASettings to be notified of changes on
+ /* register against FMASettings to be notified of changes on
* our runtime preferences
* because we only monitor here a few runtime keys, we prefer the
* callback way that the signal one
*/
- na_settings_register_key_callback(
- NA_IPREFS_IO_PROVIDERS_READ_STATUS,
+ fma_settings_register_key_callback(
+ IPREFS_IO_PROVIDERS_READ_STATUS,
G_CALLBACK( on_settings_key_changed_handler ),
object );
- na_settings_register_key_callback(
- NA_IPREFS_ITEMS_ADD_ABOUT_ITEM,
+ fma_settings_register_key_callback(
+ IPREFS_ITEMS_ADD_ABOUT_ITEM,
G_CALLBACK( on_settings_key_changed_handler ),
object );
- na_settings_register_key_callback(
- NA_IPREFS_ITEMS_CREATE_ROOT_MENU,
+ fma_settings_register_key_callback(
+ IPREFS_ITEMS_CREATE_ROOT_MENU,
G_CALLBACK( on_settings_key_changed_handler ),
object );
- na_settings_register_key_callback(
- NA_IPREFS_ITEMS_LEVEL_ZERO_ORDER,
+ fma_settings_register_key_callback(
+ IPREFS_ITEMS_LEVEL_ZERO_ORDER,
G_CALLBACK( on_settings_key_changed_handler ),
object );
- na_settings_register_key_callback(
- NA_IPREFS_ITEMS_LIST_ORDER_MODE,
+ fma_settings_register_key_callback(
+ IPREFS_ITEMS_LIST_ORDER_MODE,
G_CALLBACK( on_settings_key_changed_handler ),
object );
}
@@ -512,11 +512,11 @@ build_nautilus_menu( NautilusActions *plugin, guint target, GList *selection )
if( target != ITEM_TARGET_TOOLBAR && nautilus_menu && g_list_length( nautilus_menu )){
- items_create_root_menu = na_settings_get_boolean( NA_IPREFS_ITEMS_CREATE_ROOT_MENU, NULL,
NULL );
+ items_create_root_menu = fma_settings_get_boolean( IPREFS_ITEMS_CREATE_ROOT_MENU, NULL, NULL
);
if( items_create_root_menu ){
nautilus_menu = create_root_menu( plugin, nautilus_menu );
- items_add_about_item = na_settings_get_boolean( NA_IPREFS_ITEMS_ADD_ABOUT_ITEM, NULL,
NULL );
+ items_add_about_item = fma_settings_get_boolean( IPREFS_ITEMS_ADD_ABOUT_ITEM, NULL,
NULL );
if( items_add_about_item ){
nautilus_menu = add_about_item( plugin, nautilus_menu );
}
@@ -1030,7 +1030,7 @@ on_pivot_items_changed_handler( FMAPivot *pivot, NautilusActions *plugin )
}
}
-/* callback triggered by NASettings at the end of a burst of 'changed' signals
+/* callback triggered by FMASettings at the end of a burst of 'changed' signals
* on runtime preferences which may affect the way file manager displays
* its context menus
*/
diff --git a/src/plugin-menu/nautilus-module.c b/src/plugin-menu/nautilus-module.c
index c403b77..6209301 100644
--- a/src/plugin-menu/nautilus-module.c
+++ b/src/plugin-menu/nautilus-module.c
@@ -38,7 +38,7 @@
#include <libnautilus-extension/nautilus-extension-types.h>
#include <core/fma-gconf-migration.h>
-#include <core/na-settings.h>
+#include <core/fma-settings.h>
#include "nautilus-actions.h"
@@ -133,7 +133,7 @@ set_log_handler( void )
#else
is_log_enabled =
g_getenv( NAUTILUS_ACTIONS_DEBUG ) ||
- na_settings_get_boolean( NA_IPREFS_PLUGIN_MENU_LOG, NULL, NULL );
+ fma_settings_get_boolean( IPREFS_PLUGIN_MENU_LOG, NULL, NULL );
#endif
st_default_log_func = g_log_set_default_handler(( GLogFunc ) log_handler, GUINT_TO_POINTER(
is_log_enabled ));
diff --git a/src/utils/na-set-conf.c b/src/utils/na-set-conf.c
index f17da70..3852a26 100644
--- a/src/utils/na-set-conf.c
+++ b/src/utils/na-set-conf.c
@@ -45,7 +45,7 @@
* A program to update the N-A configuration files
*/
-#include <core/na-settings.h>
+#include <core/fma-settings.h>
static gchar *st_option_context = N_( "Set a key=value pair in a key file." );
@@ -235,16 +235,16 @@ do_update_conf( const gchar *group, const gchar *key, NAType type, const gchar *
switch( type ){
case TYPE_BOOL:
bvalue = fma_core_utils_boolean_from_string( value );
- ok = na_settings_set_boolean_ex( group, key, bvalue );
+ ok = fma_settings_set_boolean_ex( group, key, bvalue );
break;
case TYPE_INT:
ivalue = atoi( value );
- ok = na_settings_set_int_ex( group, key, ivalue );
+ ok = fma_settings_set_int_ex( group, key, ivalue );
break;
case TYPE_STR:
- ok = na_settings_set_string_ex( group, key, value );
+ ok = fma_settings_set_string_ex( group, key, value );
break;
default:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
