Commit 8b5c237a authored by Pierre Wieser's avatar Pierre Wieser

More variable renaming to get reference doc

parent 7a16649a
......@@ -88,6 +88,7 @@ myall:
for langdir in $$langdirs; do \
lang=`basename $$langdir`; \
if [ -e $$langdir/$(DOC_MODULE).xml ]; then \
$(MKDIR_P) $$manualbuilddir/$$lang; \
touch $$manualbuilddir/$$lang/$$lang.mo; \
cp $$langdir/$(DOC_MODULE).xml $$manualbuilddir/$$lang/; \
fi; \
......
......@@ -56,10 +56,10 @@ content_files = \
$(auto_created_files)
if !HAVE_GCONF
ignore_headers = na-gconf-monitor.h
ignore_headers = fma-gconf-monitor.h
else
if !ENABLE_DEPRECATED
ignore_headers = na-gconf-monitor.h
ignore_headers = fma-gconf-monitor.h
endif
endif
......@@ -96,7 +96,7 @@ core_libdir = $(top_builddir)/src/core/.libs
AM_LDFLAGS += \
$(NAUTILUS_ACTIONS_LIBS) \
-L$(core_libdir) -lna-core \
-L$(core_libdir) -lfma-core \
$(NULL)
# Need this to be able to set ourselves GTKDOC_RUN
......
......@@ -255,7 +255,7 @@ FMAFO_DATA_DESCRIPTION
FMAFO_DATA_SHORTCUT
FMAFO_DATA_SUBITEMS
FMAFO_DATA_SUBITEMS_SLIST
FMAFO_DATA_EFMABLED
FMAFO_DATA_ENABLED
FMAFO_DATA_READONLY
FMAFO_DATA_PROVIDER
FMAFO_DATA_PROVIDER_DATA
......@@ -270,8 +270,8 @@ FMAFO_DATA_LAST_ALLOCATED
FMA_FACTORY_ACTION_V1_GROUP
FMA_FACTORY_OBJECT_MENU_GROUP
FMA_FACTORY_OBJECT_PROFILE_GROUP
FMAFO_DATA_DESCFMAME
FMAFO_DATA_DESCFMAME_NOLOC
FMAFO_DATA_DESCNAME
FMAFO_DATA_DESCNAME_NOLOC
FMAFO_DATA_PATH
FMAFO_DATA_PARAMETERS
FMAFO_DATA_WORKING_DIR
......@@ -280,7 +280,7 @@ FMAFO_DATA_STARTUP_NOTIFY
FMAFO_DATA_STARTUP_WMCLASS
FMAFO_DATA_EXECUTE_AS
FMA_FACTORY_OBJECT_CONDITIONS_GROUP
FMAFO_DATA_BASEFMAMES
FMAFO_DATA_BASENAMES
FMAFO_DATA_MATCHCASE
FMAFO_DATA_MIMETYPES
FMAFO_DATA_MIMETYPES_IS_ALL
......@@ -498,7 +498,7 @@ fma_iduplicable_is_modified
fma_iduplicable_set_origin
fma_iduplicable_set_modified
fma_iduplicable_register_consumer
DuplicableMode
FMADuplicableMode
<SUBSECTION Standard>
fma_iduplicable_get_type
......@@ -753,6 +753,7 @@ fma_core_utils_dir_split_ext
fma_core_utils_file_delete
fma_core_utils_file_exists
fma_core_utils_file_is_loadable
fma_core_utils_file_list_perms
fma_core_utils_file_load_from_uri
fma_core_utils_print_version
</SECTION>
......
......@@ -47,7 +47,7 @@ gboolean fma_core_utils_boolean_from_string( const gchar *string );
/* string manipulation
*/
#ifdef NA_ENABLE_DEPRECATED
#ifdef FMA_ENABLE_DEPRECATED
gchar *fma_core_utils_str_add_prefix( const gchar *prefix, const gchar *str );
#endif
int fma_core_utils_str_collate( const gchar *str1, const gchar *str2 );
......
......@@ -95,7 +95,7 @@ gboolean fma_data_boxed_is_valid ( const FMADataBoxed *boxed );
/* These functions are deprecated starting with 3.1.0
*/
#ifdef NA_ENABLE_DEPRECATED
#ifdef FMA_ENABLE_DEPRECATED
gboolean fma_data_boxed_are_equal ( const FMADataBoxed *a, const FMADataBoxed *b );
void fma_data_boxed_dump ( const FMADataBoxed *boxed );
gchar *fma_data_boxed_get_as_string ( const FMADataBoxed *boxed );
......@@ -105,7 +105,7 @@ void fma_data_boxed_set_from_boxed ( FMADataBoxed *boxed, const FMA
void fma_data_boxed_set_from_string( FMADataBoxed *boxed, const gchar *value );
void fma_data_boxed_set_from_value ( FMADataBoxed *boxed, const GValue *value );
void fma_data_boxed_set_from_void ( FMADataBoxed *boxed, const void *value );
#endif /* NA_ENABLE_DEPRECATED */
#endif /* FMA_ENABLE_DEPRECATED */
G_END_DECLS
......
......@@ -31,7 +31,7 @@
#define __FILEMANAGER_ACTIONS_API_GCONF_MONITOR_H__
#ifdef HAVE_GCONF
#ifdef NA_ENABLE_DEPRECATED
#ifdef FMA_ENABLE_DEPRECATED
/**
* SECTION: gconf-monitor
* @title: FMAGConfMonitor
......@@ -83,6 +83,6 @@ void fma_gconf_monitor_release_monitors( GList *monitors );
G_END_DECLS
#endif /* NA_ENABLE_DEPRECATED */
#endif /* FMA_ENABLE_DEPRECATED */
#endif /* HAVE_GCONF */
#endif /* __FILEMANAGER_ACTIONS_API_GCONF_MONITOR_H__ */
......@@ -63,7 +63,7 @@ GSList *fma_gconf_utils_read_string_list ( GConfClient *gconf, const gchar *pat
/* Writing in GConf is deprecated since 3.1.0
*/
#ifdef NA_ENABLE_DEPRECATED
#ifdef FMA_ENABLE_DEPRECATED
gboolean fma_gconf_utils_write_bool ( GConfClient *gconf, const gchar *path, gboolean value, gchar **message );
gboolean fma_gconf_utils_write_int ( GConfClient *gconf, const gchar *path, gint value, gchar **message );
gboolean fma_gconf_utils_write_string ( GConfClient *gconf, const gchar *path, const gchar *value, gchar **message );
......@@ -71,7 +71,7 @@ gboolean fma_gconf_utils_write_string_list( GConfClient *gconf, const gchar *pat
gboolean fma_gconf_utils_remove_entry ( GConfClient *gconf, const gchar *path, gchar **message );
GSList *fma_gconf_utils_slist_from_string( const gchar *value );
gchar *fma_gconf_utils_slist_to_string ( GSList *slist );
#endif /* NA_ENABLE_DEPRECATED */
#endif /* FMA_ENABLE_DEPRECATED */
G_END_DECLS
......
......@@ -191,18 +191,21 @@ typedef struct {
#define IDUPLICABLE_SIGNAL_VALID_CHANGED "iduplicable-valid-changed"
/**
* DuplicateMode:
* @DUPLICATE_ONLY: only duplicates the provided object.
* @DUPLICATE_OBJECT: only duplicate a menu
* (a menu with some subitems is duplicated to an empty menu)
* @DUPLICATE_REC: recursively duplicates all the provided hierarchy.
* FMADuplicableMode:
* @FMA_DUPLICATE_ONLY: only duplicates the provided object.
* @FMA_DUPLICATE_OBJECT: only duplicate a menu
* (a menu with some subitems is duplicated to an
* empty menu)
* @FMA_DUPLICATE_REC: recursively duplicates all the provided hierarchy.
*
* The duplication mode which is to be applied to the supplied object.
*/
typedef enum {
DUPLICATE_ONLY = 1,
DUPLICATE_OBJECT,
DUPLICATE_REC
FMA_DUPLICATE_ONLY = 1,
FMA_DUPLICATE_OBJECT,
FMA_DUPLICATE_REC
}
DuplicableMode;
FMADuplicableMode;
GType fma_iduplicable_get_type ( void );
......@@ -219,8 +222,8 @@ void fma_iduplicable_set_origin ( FMAIDuplicable *object, const
void fma_iduplicable_register_consumer( GObject *consumer );
#ifdef NA_ENABLE_DEPRECATED
void fma_iduplicable_set_modified( FMAIDuplicable *object, gboolean modified );
#ifdef FMA_ENABLE_DEPRECATED
void fma_iduplicable_set_modified ( FMAIDuplicable *object, gboolean modified );
#endif
G_END_DECLS
......
......@@ -156,7 +156,7 @@ G_BEGIN_DECLS
typedef struct _FMAIExporter FMAIExporter;
typedef struct _FMAIExporterInterfacePrivate FMAIExporterInterfacePrivate;
#ifdef NA_ENABLE_DEPRECATED
#ifdef FMA_ENABLE_DEPRECATED
/**
* FMAIExporterFormat:
* @format: format identifier (ascii).
......@@ -241,7 +241,7 @@ typedef struct {
}
FMAIExporterBufferParms;
#endif /* NA_ENABLE_DEPRECATED */
#endif /* FMA_ENABLE_DEPRECATED */
/**
* FMAIExporterFormatv2:
......
......@@ -165,7 +165,7 @@ typedef struct {
}
FMAIImporterInterface;
#ifdef NA_ENABLE_DEPRECATED
#ifdef FMA_ENABLE_DEPRECATED
/**
* FMAIImporterCheckFn:
* @imported: the currently imported #FMAObjectItem -derived object.
......@@ -344,7 +344,7 @@ typedef struct {
}
FMAIImporterImportFromUriParms;
#endif /* NA_ENABLE_DEPRECATED */
#endif /* FMA_ENABLE_DEPRECATED */
/**
* FMAIImporterImportStatus:
......
......@@ -59,7 +59,7 @@
* </title>
* <para>
* Loading items is used both by the &nautilus; plugin, by the
* &nact; program, and by the command-line utilities.
* &fmact; program, and by the command-line utilities.
* </para>
* </formalpara>
* </listitem>
......@@ -69,7 +69,7 @@
* creating, updating or deleting items
* </title>
* <para>
* Updating items is a feature only used by the &nact; program and
* Updating items is a feature only used by the &fmact; program and
* by some command-line utilities.
* </para>
* </formalpara>
......@@ -86,7 +86,7 @@
* </formalpara>
* <para>
* This feature is only used by the &nautilus; plugin and by the
* &nact; program.
* &fmact; program.
* </para>
* <para>
* The #FMAIIOProvider interface does not define specific monitoring
......
......@@ -212,7 +212,7 @@ G_BEGIN_DECLS
#define fma_object_set_selection_count( obj, cond ) fma_ifactory_object_set_from_void( FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_SELECTION_COUNT, ( const void * )( cond ))
#define fma_object_set_capabilities( obj, cap ) fma_ifactory_object_set_from_void( FMA_IFACTORY_OBJECT( obj ), FMAFO_DATA_CAPABILITITES, ( const void * )( cap ))
#ifdef NA_ENABLE_DEPRECATED
#ifdef FMA_ENABLE_DEPRECATED
#define fma_object_set_modified( obj, modified ) fma_iduplicable_set_modified( FMA_IDUPLICABLE( obj ), ( modified ))
#endif
......
......@@ -164,7 +164,7 @@ void fma_object_object_dump ( const FMAObject *object );
void fma_object_object_dump_norec ( const FMAObject *object );
void fma_object_object_dump_tree ( GList *tree );
#ifdef NA_ENABLE_DEPRECATED
#ifdef FMA_ENABLE_DEPRECATED
GList *fma_object_get_hierarchy ( const FMAObject *object );
void fma_object_free_hierarchy ( GList *hierarchy );
#endif
......
......@@ -58,9 +58,9 @@ typedef void ( *FMATimeoutFunc )( void *user_data );
/**
* FMATimeout:
* @timeout: (i) timeout configurable parameter (ms)
* @handler: (i) handler function
* @user_data: (i) user data
* @timeout: timeout configurable parameter (ms)
* @handler: handler function
* @user_data: user data
*
* This structure let the user (i.e. the code which uses it) manage functions
* which should only be called after some time of inactivity, which is typically
......@@ -72,7 +72,7 @@ typedef void ( *FMATimeoutFunc )( void *user_data );
*
* Such a structure must be allocated for each managed event.
*
* When an event is detected, the na_timeout_event() function must be called
* When an event is detected, the fma_timeout_event() function must be called
* with this structure. The function makes sure that the @handler callback
* will be triggered as soon as no event will be recorded after @timeout
* milliseconds of inactivity.
......@@ -90,7 +90,7 @@ typedef struct {
}
FMATimeout;
void na_timeout_event( FMATimeout *timeout );
void fma_timeout_event( FMATimeout *timeout );
G_END_DECLS
......
......@@ -48,7 +48,7 @@
#define SIZE_MIN 1
#define SIZE_MAX 1048576 /* 1 MB */
#ifdef NA_ENABLE_DEPRECATED
#ifdef FMA_ENABLE_DEPRECATED
static GSList *text_to_string_list( const gchar *text, const gchar *separator, const gchar *default_value );
#endif
static gboolean info_dir_is_writable( GFile *file, const gchar *path );
......@@ -72,7 +72,7 @@ fma_core_utils_boolean_from_string( const gchar *string )
return( g_ascii_strcasecmp( string, "true" ) == 0 || atoi( string ) != 0 );
}
#ifdef NA_ENABLE_DEPRECATED
#ifdef FMA_ENABLE_DEPRECATED
/**
* fma_core_utils_str_add_prefix:
* @prefix: the prefix to be prepended.
......@@ -127,7 +127,7 @@ text_to_string_list( const gchar *text, const gchar *separator, const gchar *def
g_free( source );
return( strlist );
}
#endif /* NA_ENABLE_DEPRECATED */
#endif /* FMA_ENABLE_DEPRECATED */
/**
* fma_core_utils_str_collate:
......
......@@ -367,7 +367,7 @@ fma_data_boxed_get_param_spec( const FMADataDef *def )
return( spec );
}
#ifdef NA_ENABLE_DEPRECATED
#ifdef FMA_ENABLE_DEPRECATED
/**
* fma_data_boxed_are_equal:
* @a: the first #FMADataBoxed object.
......@@ -386,7 +386,7 @@ fma_data_boxed_are_equal( const FMADataBoxed *a, const FMADataBoxed *b )
return( fma_boxed_are_equal( FMA_BOXED( a ), FMA_BOXED( b )));
}
#endif /* NA_ENABLE_DEPRECATED */
#endif /* FMA_ENABLE_DEPRECATED */
/**
* fma_data_boxed_is_default:
......@@ -443,7 +443,7 @@ fma_data_boxed_is_valid( const FMADataBoxed *boxed )
return( is_valid );
}
#ifdef NA_ENABLE_DEPRECATED
#ifdef FMA_ENABLE_DEPRECATED
/**
* fma_data_boxed_dump:
* @boxed: this #FMADataBoxed object.
......@@ -573,7 +573,7 @@ fma_data_boxed_set_from_void( FMADataBoxed *boxed, const void *value )
{
fma_boxed_set_from_void( FMA_BOXED( boxed ), value );
}
#endif /* NA_ENABLE_DEPRECATED */
#endif /* FMA_ENABLE_DEPRECATED */
static GParamSpec *
bool_spec( const FMADataDef *def )
......
......@@ -123,7 +123,7 @@ exporter_get_formats( const FMAIExporter *exporter )
if( FMA_IEXPORTER_GET_INTERFACE( exporter )->get_formats ){
if( version == 1 ){
#ifdef NA_ENABLE_DEPRECATED
#ifdef FMA_ENABLE_DEPRECATED
const FMAIExporterFormat *strv1;
strv1 = FMA_IEXPORTER_GET_INTERFACE( exporter )->get_formats( exporter );
while( strv1->format ){
......
......@@ -34,7 +34,7 @@
#include <api/fma-gconf-monitor.h>
#ifdef HAVE_GCONF
#ifdef NA_ENABLE_DEPRECATED
#ifdef FMA_ENABLE_DEPRECATED
/* private class data
*/
......@@ -307,5 +307,5 @@ release_monitor( FMAGConfMonitor *monitor )
}
}
#endif /* NA_ENABLE_DEPRECATED */
#endif /* FMA_ENABLE_DEPRECATED */
#endif /* HAVE_GCONF */
......@@ -41,9 +41,9 @@
static void dump_entry( GConfEntry *entry, void *user_data );
static GConfValue *read_value( GConfClient *gconf, const gchar *path, gboolean use_schema, GConfValueType type );
#ifdef NA_ENABLE_DEPRECATED
#ifdef FMA_ENABLE_DEPRECATED
static gboolean sync_gconf( GConfClient *gconf, gchar **message );
#endif /* NA_ENABLE_DEPRECATED */
#endif /* FMA_ENABLE_DEPRECATED */
/**
* fma_gconf_utils_get_subdirs:
......@@ -526,7 +526,7 @@ fma_gconf_utils_read_string_list( GConfClient *gconf, const gchar *path )
return( list_strings );
}
#ifdef NA_ENABLE_DEPRECATED
#ifdef FMA_ENABLE_DEPRECATED
/**
* fma_gconf_utils_write_bool:
* @gconf: a GConfClient instance.
......@@ -792,7 +792,7 @@ fma_gconf_utils_slist_to_string( GSList *slist )
return( g_string_free( str, FALSE ));
}
#endif /* NA_ENABLE_DEPRECATED */
#endif /* FMA_ENABLE_DEPRECATED */
static GConfValue *
read_value( GConfClient *gconf, const gchar *path, gboolean use_schema, GConfValueType type )
......@@ -827,7 +827,7 @@ read_value( GConfClient *gconf, const gchar *path, gboolean use_schema, GConfVal
return( value );
}
#ifdef NA_ENABLE_DEPRECATED
#ifdef FMA_ENABLE_DEPRECATED
static gboolean
sync_gconf( GConfClient *gconf, gchar **message )
{
......@@ -847,6 +847,6 @@ sync_gconf( GConfClient *gconf, gchar **message )
return( ret );
}
#endif /* NA_ENABLE_DEPRECATED */
#endif /* FMA_ENABLE_DEPRECATED */
#endif /* HAVE_GCONF */
......@@ -272,7 +272,7 @@ fma_iduplicable_dump( const FMAIDuplicable *object )
/**
* fma_iduplicable_duplicate:
* @object: the #FMAIDuplicable object to be duplicated.
* @mode: the %DuplicableMode duplication mode.
* @mode: the %FMADuplicableMode duplication mode.
*
* Exactly duplicates a #FMAIDuplicable -implemented object, including
* modification and validity status which are copied from @object to
......@@ -466,7 +466,7 @@ fma_iduplicable_set_origin( FMAIDuplicable *object, const FMAIDuplicable *origin
str->origin = ( FMAIDuplicable * ) origin;
}
#ifdef NA_ENABLE_DEPRECATED
#ifdef FMA_ENABLE_DEPRECATED
/**
* fma_iduplicable_set_modified:
* @object: the #FMAIDuplicable object whose modification status is to be set.
......@@ -487,7 +487,7 @@ fma_iduplicable_set_modified( FMAIDuplicable *object, gboolean modified )
str = get_duplicable_str( object );
str->modified = modified;
}
#endif /* NA_ENABLE_DEPRECATED */
#endif /* FMA_ENABLE_DEPRECATED */
static void
v_copy( FMAIDuplicable *target, const FMAIDuplicable *source, guint mode )
......
......@@ -50,7 +50,7 @@ static void interface_base_init( FMAIImporterInterface *klass );
static void interface_base_finalize( FMAIImporterInterface *klass );
static guint iimporter_get_version( const FMAIImporter *instance );
#ifdef NA_ENABLE_DEPRECATED
#ifdef FMA_ENABLE_DEPRECATED
static void renumber_label_item( FMAIImporterManageImportModeParms *parms );
#endif
......@@ -180,7 +180,7 @@ fma_iimporter_import_from_uri( const FMAIImporter *importer, FMAIImporterImportF
return( code );
}
#ifdef NA_ENABLE_DEPRECATED
#ifdef FMA_ENABLE_DEPRECATED
/**
* fma_iimporter_manage_import_mode:
* @parms: a #FMAIImporterManageImportModeParms struct.
......@@ -315,4 +315,4 @@ renumber_label_item( FMAIImporterManageImportModeParms *parms )
g_free( tmp );
g_free( label );
}
#endif /* NA_ENABLE_DEPRECATED */
#endif /* FMA_ENABLE_DEPRECATED */
......@@ -198,7 +198,7 @@ do_is_able_to_write( const FMAIIOProvider *instance )
* want to immediately reload the current list of items, menus and actions
* (this is for example what &nautilus; plugin does); it may also choose
* to ask the user if he is willing to reload such a current list (and
* this is the way &nact; has chosen to deal with this message).
* this is the way &fmact; has chosen to deal with this message).
*
* Note that application FMAPivot/FMAUpdater pivot is typically the only
* object connected to this signal. It acts so as a filtering proxy,
......
......@@ -65,7 +65,7 @@
G_BEGIN_DECLS
#ifndef NA_ENABLE_DEPRECATED
#ifndef FMA_ENABLE_DEPRECATED
/*
* FMAImporterImportMode:
* @IMPORTER_MODE_NO_IMPORT: a "do not import" mode.
......
......@@ -238,8 +238,8 @@ object_copy( FMAObject *target, const FMAObject *source, guint mode )
if( !dest->private->dispose_has_run && !src->private->dispose_has_run ){
if( mode == DUPLICATE_REC ||
( mode == DUPLICATE_OBJECT && G_OBJECT_TYPE( source ) == FMA_TYPE_OBJECT_ACTION )){
if( mode == FMA_DUPLICATE_REC ||
( mode == FMA_DUPLICATE_OBJECT && G_OBJECT_TYPE( source ) == FMA_TYPE_OBJECT_ACTION )){
copy_children( dest, src, mode );
}
......
......@@ -657,7 +657,7 @@ fma_object_object_unref( FMAObject *object )
}
}
#ifdef NA_ENABLE_DEPRECATED
#ifdef FMA_ENABLE_DEPRECATED
/*
* build the class hierarchy
* returns a list of GObjectClass, which starts with FMAObject,
......@@ -725,7 +725,7 @@ fma_object_free_hierarchy( GList *hierarchy )
{
g_list_free( hierarchy );
}
#endif /* NA_ENABLE_DEPRECATED */
#endif /* FMA_ENABLE_DEPRECATED */
/**
* fma_object_object_debug_invalid:
......
......@@ -631,7 +631,7 @@ fma_pivot_on_item_changed_handler( FMAIIOProvider *provider, FMAPivot *pivot )
if( !pivot->private->dispose_has_run ){
g_debug( "%s: provider=%p, pivot=%p", thisfn, ( void * ) provider, ( void * ) pivot );
na_timeout_event( &pivot->private->change_timeout );
fma_timeout_event( &pivot->private->change_timeout );
}
}
......
......@@ -1163,7 +1163,7 @@ on_keyfile_changed( GFileMonitor *monitor,
GFile *file, GFile *other_file, GFileMonitorEvent event_type )
{
settings_new();
na_timeout_event( &st_settings->private->timeout );
fma_timeout_event( &st_settings->private->timeout );
}
static void
......
......@@ -37,11 +37,11 @@ static gboolean on_timeout_event_timeout( FMATimeout *timeout );
static gulong time_val_diff( const GTimeVal *recent, const GTimeVal *old );
/**
* na_timeout_event:
* fma_timeout_event:
* @timeout: the #FMATimeout structure which will handle this event.
*/
void
na_timeout_event( FMATimeout *event )
fma_timeout_event( FMATimeout *event )
{
g_return_if_fail( event != NULL );
......
......@@ -371,7 +371,7 @@ fma_desktop_provider_on_monitor_event( FMADesktopProvider *provider )
if( !provider->private->dispose_has_run ){
na_timeout_event( &provider->private->timeout );
fma_timeout_event( &provider->private->timeout );
}
}
......
......@@ -72,7 +72,7 @@ static void write_done_write_subitems_list( FMADesktopFile *ndp, FMAO
static ExportFormatFn *find_export_format_fn( const gchar *format );
#ifdef NA_ENABLE_DEPRECATED
#ifdef FMA_ENABLE_DEPRECATED
static ExportFormatFn *find_export_format_fn_from_quark( GQuark format );
#endif
......@@ -371,7 +371,7 @@ fma_desktop_writer_iexporter_export_to_buffer( const FMAIExporter *instance, FMA
if( code == FMA_IEXPORTER_CODE_OK ){
#ifdef NA_ENABLE_DEPRECATED
#ifdef FMA_ENABLE_DEPRECATED
if( parms->version == 1 ){
fmt = find_export_format_fn_from_quark((( FMAIExporterBufferParms * ) parms )->format );
} else {
......@@ -431,7 +431,7 @@ fma_desktop_writer_iexporter_export_to_file( const FMAIExporter *instance, FMAIE
if( code == FMA_IEXPORTER_CODE_OK ){
#ifdef NA_ENABLE_DEPRECATED
#ifdef FMA_ENABLE_DEPRECATED
if( parms->version == 1 ){
fmt = find_export_format_fn_from_quark((( FMAIExporterFileParms * ) parms )->format );
} else {
......@@ -653,7 +653,7 @@ find_export_format_fn( const gchar *format )
return( found );
}
#ifdef NA_ENABLE_DEPRECATED
#ifdef FMA_ENABLE_DEPRECATED
static ExportFormatFn *
find_export_format_fn_from_quark( GQuark format )
{
......
......@@ -52,7 +52,7 @@ struct _FMAGConfProviderClassPrivate {
static GType st_module_type = 0;
static GObjectClass *st_parent_class = NULL;
#ifdef NA_ENABLE_DEPRECATED
#ifdef FMA_ENABLE_DEPRECATED
static gint st_burst_timeout = 100; /* burst timeout in msec */
#endif
......@@ -69,7 +69,7 @@ static guint iio_provider_get_version( const FMAIIOProvider *provider );
static void ifactory_provider_iface_init( FMAIFactoryProviderInterface *iface );
static guint ifactory_provider_get_version( const FMAIFactoryProvider *provider );
#ifdef NA_ENABLE_DEPRECATED
#ifdef FMA_ENABLE_DEPRECATED
static GList *install_monitors( FMAGConfProvider *provider );
static void config_path_changed_cb( GConfClient *client, guint cnxn_id, GConfEntry *entry, FMAGConfProvider *provider );
static gboolean config_path_changed_trigger_interface( FMAGConfProvider *provider );
......@@ -156,7 +156,7 @@ instance_init( GTypeInstance *instance, gpointer klass )
self->private->gconf = gconf_client_get_default();
#ifdef NA_ENABLE_DEPRECATED
#ifdef FMA_ENABLE_DEPRECATED
self->private->monitors = install_monitors( self );
#endif
}
......@@ -177,7 +177,7 @@ instance_dispose( GObject *object )
self->private->dispose_has_run = TRUE;
#ifdef NA_ENABLE_DEPRECATED
#ifdef FMA_ENABLE_DEPRECATED
/* release the GConf monitoring */
fma_gconf_monitor_release_monitors( self->private->monitors );
#endif
......@@ -225,7 +225,7 @@ iio_provider_iface_init( FMAIIOProviderInterface *iface )
iface->read_items = fma_gconf_reader_iio_provider_read_items;
iface->is_willing_to_write = fma_gconf_writer_iio_provider_is_willing_to_write;
iface->is_able_to_write = fma_gconf_writer_iio_provider_is_able_to_write;
#ifdef NA_ENABLE_DEPRECATED
#ifdef FMA_ENABLE_DEPRECATED
iface->write_item = fma_gconf_writer_iio_provider_write_item;
iface->delete_item = fma_gconf_writer_iio_provider_delete_item;
#else
......@@ -264,7 +264,7 @@ ifactory_provider_iface_init( FMAIFactoryProviderInterface *iface )
iface->read_start = fma_gconf_reader_read_start;
iface->read_data = fma_gconf_reader_read_data;
iface->read_done = fma_gconf_reader_read_done;
#ifdef NA_ENABLE_DEPRECATED
#ifdef FMA_ENABLE_DEPRECATED
iface->write_start = fma_gconf_writer_write_start;
iface->write_data = fma_gconf_writer_write_data;
iface->write_done = fma_gconf_writer_write_done;
......@@ -281,7 +281,7 @@ ifactory_provider_get_version( const FMAIFactoryProvider *provider )
return( 1 );
}
#ifdef NA_ENABLE_DEPRECATED
#ifdef FMA_ENABLE_DEPRECATED
static GList *
install_monitors( FMAGConfProvider *provider )
{
......@@ -411,4 +411,4 @@ time_val_diff( const GTimeVal *recent, const GTimeVal *old )
microsec += recent->tv_usec - old->tv_usec;
return( microsec );
}
#endif /* NA_ENABLE_DEPRECATED */
#endif /* FMA_ENABLE_DEPRECATED */
......@@ -45,7 +45,7 @@
#include "fma-gconf-writer.h"
#include "fma-gconf-keys.h"
#ifdef NA_ENABLE_DEPRECATED
#ifdef FMA_ENABLE_DEPRECATED
static void write_start_write_type( FMAGConfProvider *provider, FMAObjectItem *item );
static void write_start_write_version( FMAGConfProvider *provider, FMAObjectItem *item );
#endif
......@@ -56,7 +56,7 @@ static void write_start_write_version( FMAGConfProvider *provider, FMAObjectItem
gboolean
fma_gconf_writer_iio_provider_is_willing_to_write( const FMAIIOProvider *provider )
{
#ifdef NA_ENABLE_DEPRECATED
#ifdef FMA_ENABLE_DEPRECATED
return( TRUE );
#else
return( FALSE );
......@@ -77,7 +77,7 @@ fma_gconf_writer_iio_provider_is_willing_to_write( const FMAIIOProvider *provide
gboolean
fma_gconf_writer_iio_provider_is_able_to_write( const FMAIIOProvider *provider )
{
#ifdef NA_ENABLE_DEPRECATED
#ifdef FMA_ENABLE_DEPRECATED
static const gchar *thisfn = "fma_gconf_writer_iio_provider_is_able_to_write";
static const gchar *path = "/apps/nautilus-actions/foo";
FMAGConfProvider *self;
......@@ -119,7 +119,7 @@ fma_gconf_writer_iio_provider_is_able_to_write( const FMAIIOProvider *provider )
#endif
}
#ifdef NA_ENABLE_DEPRECATED
#ifdef FMA_ENABLE_DEPRECATED
/*
* update an existing item or write a new one
* in all cases, it is much more easy to delete the existing entries
......@@ -393,4 +393,4 @@ fma_gconf_writer_write_done( const FMAIFactoryProvider *writer, void *writer_dat
{
return( IIO_PROVIDER_CODE_OK );
}
#endif /* NA_ENABLE_DEPRECATED */
#endif /* FMA_ENABLE_DEPRECATED */
......@@ -44,7 +44,7 @@ gboolean fma_gconf_writer_iio_provider_is_able_to_write ( const FMAIIOProvider
/* Writing into GConf is deprecated since 3.1.0
*/
#ifdef NA_ENABLE_DEPRECATED
#ifdef FMA_ENABLE_DEPRECATED
guint fma_gconf_writer_iio_provider_write_item ( const FMAIIOProvider *provider,
const FMAObjectItem *item,
GSList **message );
......@@ -70,7 +70,7 @@ guint fma_gconf_writer_write_done ( const FMAIFactoryPro
void *writer_data,
const FMAIFactoryObject *object,
GSList **messages );
#endif /* NA_ENABLE_DEPRECATED */
#endif /* FMA_ENABLE_DEPRECATED */
G_END_DECLS
......
......@@ -117,7 +117,7 @@ static xmlDocPtr build_xml_doc( FMAXMLWriter *writer );
static gchar *convert_to_gconf_slist( const gchar *str );
static ExportFormatFn *find_export_format_fn( const gchar *format );
#ifdef NA_ENABLE_DEPRECATED
#ifdef FMA_ENABLE_DEPRECATED
static ExportFormatFn *find_export_format_fn_from_quark( GQuark format );
#endif
......@@ -292,7 +292,7 @@ fma_xml_writer_export_to_buffer( const FMAIExporter *instance, FMAIExporterBuffe
writer->private->provider = ( FMAIExporter * ) instance;
writer->private->exported = parms->exported;
writer->private->messages = parms->messages;
#ifdef NA_ENABLE_DEPRECATED
#ifdef FMA_ENABLE_DEPRECATED
if( parms->version == 1 ){
writer->private->fn_str = find_export_format_fn_from_quark((( FMAIExporterBufferParms * ) parms )->format );
} else {
......@@ -350,7 +350,7 @@ fma_xml_writer_export_to_file( const FMAIExporter *instance, FMAIExporterFilePar