Commit 9c6d9cb8 authored by Pierre Wieser's avatar Pierre Wieser

NAPivot class is renamed to FMAPivot

parent 08a12823
......@@ -197,7 +197,7 @@ typedef struct {
* </para>
* </listitem>
* </itemizedlist>
* Items which may have been loaded by NAPivot at the start of the
* Items which may have been loaded by FMAPivot at the start of the
* application, and deleted meanwhile, are just ignored.
*
* Returns: the already existing #FMAObjectItem with same id, or %NULL.
......
......@@ -111,8 +111,8 @@ libna_core_la_SOURCES = \
fma-object-profile-factory.c \
fma-object-menu.c \
fma-object-menu-factory.c \
na-pivot.c \
na-pivot.h \
fma-pivot.c \
fma-pivot.h \
na-selected-info.c \
na-selected-info.h \
na-settings.c \
......
......@@ -66,7 +66,7 @@ static void on_pixbuf_finalized( gpointer user_data, GObject *pixbuf );
/*
* fma_exporter_get_formats:
* @pivot: the #NAPivot instance.
* @pivot: the #FMAPivot instance.
*
* Returns: a list of #FMAExportFormat objects, each of them addressing an
* available export format, i.e. a format provided by a module which
......@@ -75,17 +75,17 @@ static void on_pixbuf_finalized( gpointer user_data, GObject *pixbuf );
* The returned list should later be fma_exporter_free_formats() by the caller.
*/
GList *
fma_exporter_get_formats( const NAPivot *pivot )
fma_exporter_get_formats( const FMAPivot *pivot )
{
GList *iexporters, *imod;
GList *formats;
GList *str_list, *is;
FMAExportFormat *format;
g_return_val_if_fail( NA_IS_PIVOT( pivot ), NULL );
g_return_val_if_fail( FMA_IS_PIVOT( pivot ), NULL );
formats = NULL;
iexporters = na_pivot_get_providers( pivot, FMA_TYPE_IEXPORTER );
iexporters = fma_pivot_get_providers( pivot, FMA_TYPE_IEXPORTER );
for( imod = iexporters ; imod ; imod = imod->next ){
str_list = exporter_get_formats( FMA_IEXPORTER( imod->data ));
......@@ -98,7 +98,7 @@ fma_exporter_get_formats( const NAPivot *pivot )
exporter_free_formats( FMA_IEXPORTER( imod->data ), str_list );
}
na_pivot_free_providers( iexporters );
fma_pivot_free_providers( iexporters );
return( formats );
}
......@@ -247,7 +247,7 @@ on_pixbuf_finalized( gpointer user_data /* ==NULL */, GObject *pixbuf )
/*
* fma_exporter_to_buffer:
* @pivot: the #NAPivot pivot for the running application.
* @pivot: the #FMAPivot pivot for the running application.
* @item: a #FMAObjectItem-derived object.
* @format: the target format identifier.
* @messages: a pointer to a #GSList list of strings; the provider
......@@ -259,7 +259,7 @@ on_pixbuf_finalized( gpointer user_data /* ==NULL */, GObject *pixbuf )
* be g_free() by the caller, or %NULL if an error has been detected.
*/
gchar *
fma_exporter_to_buffer( const NAPivot *pivot,
fma_exporter_to_buffer( const FMAPivot *pivot,
const FMAObjectItem *item, const gchar *format, GSList **messages )
{
static const gchar *thisfn = "fma_exporter_to_buffer";
......@@ -269,7 +269,7 @@ fma_exporter_to_buffer( const NAPivot *pivot,
gchar *name;
gchar *msg;
g_return_val_if_fail( NA_IS_PIVOT( pivot ), NULL );
g_return_val_if_fail( FMA_IS_PIVOT( pivot ), NULL );
g_return_val_if_fail( FMA_IS_OBJECT_ITEM( item ), NULL );
buffer = NULL;
......@@ -318,7 +318,7 @@ fma_exporter_to_buffer( const NAPivot *pivot,
/*
* fma_exporter_to_file:
* @pivot: the #NAPivot pivot for the running application.
* @pivot: the #FMAPivot pivot for the running application.
* @item: a #FMAObjectItem-derived object.
* @folder_uri: the URI of the target folder.
* @format: the target format identifier.
......@@ -331,7 +331,7 @@ fma_exporter_to_buffer( const NAPivot *pivot,
* should be g_free() by the caller, or %NULL if an error has been detected.
*/
gchar *
fma_exporter_to_file( const NAPivot *pivot,
fma_exporter_to_file( const FMAPivot *pivot,
const FMAObjectItem *item, const gchar *folder_uri, const gchar *format, GSList **messages )
{
static const gchar *thisfn = "fma_exporter_to_file";
......@@ -341,7 +341,7 @@ fma_exporter_to_file( const NAPivot *pivot,
gchar *msg;
gchar *name;
g_return_val_if_fail( NA_IS_PIVOT( pivot ), NULL );
g_return_val_if_fail( FMA_IS_PIVOT( pivot ), NULL );
g_return_val_if_fail( FMA_IS_OBJECT_ITEM( item ), NULL );
export_uri = NULL;
......@@ -405,7 +405,7 @@ exporter_get_name( const FMAIExporter *exporter )
/**
* fma_exporter_find_for_format:
* @pivot: the #NAPivot instance.
* @pivot: the #FMAPivot instance.
* @format: the string identifier of the searched format.
*
* Returns: the #FMAIExporter instance which provides the @format export
......@@ -413,14 +413,14 @@ exporter_get_name( const FMAIExporter *exporter )
* released by the caller.
*/
FMAIExporter *
fma_exporter_find_for_format( const NAPivot *pivot, const gchar *format )
fma_exporter_find_for_format( const FMAPivot *pivot, const gchar *format )
{
FMAIExporter *exporter;
GList *formats, *ifmt;
gchar *id;
FMAExportFormat *export_format;
g_return_val_if_fail( NA_IS_PIVOT( pivot ), NULL );
g_return_val_if_fail( FMA_IS_PIVOT( pivot ), NULL );
exporter = NULL;
formats = fma_exporter_get_formats( pivot );
......
......@@ -39,29 +39,29 @@
#include <api/fma-object-api.h>
#include "fma-ioption.h"
#include "na-pivot.h"
#include "fma-pivot.h"
G_BEGIN_DECLS
#define EXPORTER_FORMAT_ASK "Ask"
#define EXPORTER_FORMAT_NOEXPORT "NoExport"
GList *fma_exporter_get_formats ( const NAPivot *pivot );
GList *fma_exporter_get_formats ( const FMAPivot *pivot );
void fma_exporter_free_formats ( GList *formats );
FMAIOption *fma_exporter_get_ask_option ( void );
gchar *fma_exporter_to_buffer ( const NAPivot *pivot,
gchar *fma_exporter_to_buffer ( const FMAPivot *pivot,
const FMAObjectItem *item,
const gchar *format,
GSList **messages );
gchar *fma_exporter_to_file ( const NAPivot *pivot,
gchar *fma_exporter_to_file ( const FMAPivot *pivot,
const FMAObjectItem *item,
const gchar *folder_uri,
const gchar *format,
GSList **messages );
FMAIExporter *fma_exporter_find_for_format( const NAPivot *pivot,
FMAIExporter *fma_exporter_find_for_format( const FMAPivot *pivot,
const gchar *format );
G_END_DECLS
......
......@@ -208,7 +208,7 @@ fma_icontext_are_equal( const FMAIContext *a, const FMAIContext *b )
* items.
*
* This function is called by <methodname>build_nautilus_menus</methodname>
* plugin function for each item found in NAPivot items list, and, when this
* plugin function for each item found in FMAPivot items list, and, when this
* an action, for each profile of this action.
*
* Returns: %TRUE if this @context succeeds to all tests and is so a
......
......@@ -200,7 +200,7 @@ do_is_able_to_write( const FMAIIOProvider *instance )
* 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).
*
* Note that application NAPivot/NAUpdater pivot is typically the only
* Note that application FMAPivot/NAUpdater pivot is typically the only
* object connected to this signal. It acts so as a filtering proxy,
* re-emitting its own 'items-changed' signal for a whole set of detected
* underlying modifications.
......
......@@ -43,7 +43,7 @@
#include <api/fma-object-item.h>
#include "na-pivot.h"
#include "fma-pivot.h"
G_BEGIN_DECLS
......@@ -77,7 +77,7 @@ typedef struct {
gchar *uri;
guint count;
gboolean keep_choice;
const NAPivot *pivot;
const FMAPivot *pivot;
}
FMAImporterAskUserParms;
......
......@@ -89,7 +89,7 @@ static FMAImportModeStr st_import_ask_mode = {
"import-mode-ask.png"
};
static FMAImporterResult *import_from_uri( const NAPivot *pivot, GList *modules, const gchar *uri );
static FMAImporterResult *import_from_uri( const FMAPivot *pivot, GList *modules, const gchar *uri );
static void manage_import_mode( FMAImporterParms *parms, GList *results, FMAImporterAskUserParms *ask_parms, FMAImporterResult *result );
static FMAObjectItem *is_importing_already_exists( FMAImporterParms *parms, GList *results, FMAImporterResult *result );
static void renumber_label_item( FMAObjectItem *item );
......@@ -102,7 +102,7 @@ static FMAIOption *get_mode_from_struct( const FMAImportModeStr *str );
/*
* fma_importer_import_from_uris:
* @pivot: the #NAPivot pivot for this application.
* @pivot: the #FMAPivot pivot for this application.
* @parms: a #FMAImporterParms structure.
*
* Imports a list of URIs.
......@@ -126,7 +126,7 @@ static FMAIOption *get_mode_from_struct( const FMAImportModeStr *str );
* Since: 2.30
*/
GList *
fma_importer_import_from_uris( const NAPivot *pivot, FMAImporterParms *parms )
fma_importer_import_from_uris( const FMAPivot *pivot, FMAImporterParms *parms )
{
static const gchar *thisfn = "fma_importer_import_from_uris";
GList *results, *ires;
......@@ -136,7 +136,7 @@ fma_importer_import_from_uris( const NAPivot *pivot, FMAImporterParms *parms )
FMAImporterAskUserParms ask_parms;
gchar *mode_str;
g_return_val_if_fail( NA_IS_PIVOT( pivot ), NULL );
g_return_val_if_fail( FMA_IS_PIVOT( pivot ), NULL );
g_return_val_if_fail( parms != NULL, NULL );
results = NULL;
......@@ -145,14 +145,14 @@ fma_importer_import_from_uris( const NAPivot *pivot, FMAImporterParms *parms )
/* first phase: just try to import the uris into memory
*/
modules = na_pivot_get_providers( pivot, FMA_TYPE_IIMPORTER );
modules = fma_pivot_get_providers( pivot, FMA_TYPE_IIMPORTER );
for( uri = parms->uris ; uri ; uri = uri->next ){
import_result = import_from_uri( pivot, modules, ( const gchar * ) uri->data );
results = g_list_prepend( results, import_result );
}
na_pivot_free_providers( modules );
fma_pivot_free_providers( modules );
results = g_list_reverse( results );
......@@ -213,7 +213,7 @@ fma_importer_free_result( FMAImporterResult *result )
* imported the item.
*/
static FMAImporterResult *
import_from_uri( const NAPivot *pivot, GList *modules, const gchar *uri )
import_from_uri( const FMAPivot *pivot, GList *modules, const gchar *uri )
{
FMAImporterResult *result;
FMAIImporterImportFromUriParmsv2 provider_parms;
......
......@@ -61,7 +61,7 @@
#include <api/fma-object-item.h>
#include "fma-ioption.h"
#include "na-pivot.h"
#include "fma-pivot.h"
G_BEGIN_DECLS
......@@ -141,7 +141,7 @@ typedef struct {
}
FMAImporterResult;
GList *fma_importer_import_from_uris( const NAPivot *pivot, FMAImporterParms *parms );
GList *fma_importer_import_from_uris( const FMAPivot *pivot, FMAImporterParms *parms );
void fma_importer_free_result ( FMAImporterResult *result );
......
......@@ -85,20 +85,20 @@ static void instance_finalize( GObject *object );
static void dump( const FMAIOProvider *provider );
static void dump_providers_list( GList *providers );
#endif
static FMAIOProvider *io_provider_new( const NAPivot *pivot, FMAIIOProvider *module, const gchar *id );
static GList *io_providers_list_add_from_plugins( const NAPivot *pivot, GList *list );
static GList *io_providers_list_add_from_prefs( const NAPivot *pivot, GList *objects_list );
static FMAIOProvider *io_provider_new( const FMAPivot *pivot, FMAIIOProvider *module, const gchar *id );
static GList *io_providers_list_add_from_plugins( const FMAPivot *pivot, GList *list );
static GList *io_providers_list_add_from_prefs( const FMAPivot *pivot, GList *objects_list );
static GSList *io_providers_get_from_prefs( void );
static GList *io_providers_list_add_from_write_order( const NAPivot *pivot, GList *objects_list );
static GList *io_providers_list_append_object( const NAPivot *pivot, GList *list, FMAIIOProvider *module, const gchar *id );
static void io_providers_list_set_module( const NAPivot *pivot, FMAIOProvider *provider_object, FMAIIOProvider *provider_module );
static gboolean is_conf_writable( const FMAIOProvider *provider, const NAPivot *pivot, gboolean *mandatory );
static gboolean is_finally_writable( const FMAIOProvider *provider, const NAPivot *pivot, guint *reason );
static GList *load_items_filter_unwanted_items( const NAPivot *pivot, GList *merged, guint loadable_set );
static GList *io_providers_list_add_from_write_order( const FMAPivot *pivot, GList *objects_list );
static GList *io_providers_list_append_object( const FMAPivot *pivot, GList *list, FMAIIOProvider *module, const gchar *id );
static void io_providers_list_set_module( const FMAPivot *pivot, FMAIOProvider *provider_object, FMAIIOProvider *provider_module );
static gboolean is_conf_writable( const FMAIOProvider *provider, const FMAPivot *pivot, gboolean *mandatory );
static gboolean is_finally_writable( const FMAIOProvider *provider, const FMAPivot *pivot, guint *reason );
static GList *load_items_filter_unwanted_items( const FMAPivot *pivot, GList *merged, guint loadable_set );
static GList *load_items_filter_unwanted_items_rec( GList *merged, guint loadable_set );
static GList *load_items_get_merged_list( const NAPivot *pivot, guint loadable_set, GSList **messages );
static GList *load_items_get_merged_list( const FMAPivot *pivot, guint loadable_set, GSList **messages );
static GList *load_items_hierarchy_build( GList **tree, GSList *level_zero, gboolean list_if_empty, FMAObjectItem *parent );
static GList *load_items_hierarchy_sort( const NAPivot *pivot, GList *tree, GCompareFunc fn );
static GList *load_items_hierarchy_sort( const FMAPivot *pivot, GList *tree, GCompareFunc fn );
static gint peek_item_by_id_compare( const FMAObject *obj, const gchar *id );
static FMAIOProvider *peek_provider_by_id( const GList *providers, const gchar *id );
......@@ -309,7 +309,7 @@ instance_finalize( GObject *object )
/*
* fma_io_provider_find_writable_io_provider:
* @pivot: the #NAPivot instance.
* @pivot: the #FMAPivot instance.
*
* Returns: the first willing and able to write I/O provider, or NULL.
*
......@@ -317,7 +317,7 @@ instance_finalize( GObject *object )
* be released by the caller.
*/
FMAIOProvider *
fma_io_provider_find_writable_io_provider( const NAPivot *pivot )
fma_io_provider_find_writable_io_provider( const FMAPivot *pivot )
{
const GList *providers;
const GList *ip;
......@@ -337,7 +337,7 @@ fma_io_provider_find_writable_io_provider( const NAPivot *pivot )
/*
* fma_io_provider_find_io_provider_by_id:
* @pivot: the #NAPivot instance.
* @pivot: the #FMAPivot instance.
* @id: the identifier of the searched I/O provider.
*
* Returns: the I/O provider, or NULL.
......@@ -346,7 +346,7 @@ fma_io_provider_find_writable_io_provider( const NAPivot *pivot )
* be released by the caller.
*/
FMAIOProvider *
fma_io_provider_find_io_provider_by_id( const NAPivot *pivot, const gchar *id )
fma_io_provider_find_io_provider_by_id( const FMAPivot *pivot, const gchar *id )
{
const GList *providers;
const GList *ip;
......@@ -368,7 +368,7 @@ fma_io_provider_find_io_provider_by_id( const NAPivot *pivot, const gchar *id )
/*
* fma_io_provider_get_io_providers_list:
* @pivot: the current #NAPivot instance.
* @pivot: the current #FMAPivot instance.
*
* Build (if not already done) the write-ordered list of currently
* available FMAIOProvider objects.
......@@ -389,9 +389,9 @@ fma_io_provider_find_io_provider_by_id( const NAPivot *pivot, const gchar *id )
* released by the caller.
*/
const GList *
fma_io_provider_get_io_providers_list( const NAPivot *pivot )
fma_io_provider_get_io_providers_list( const FMAPivot *pivot )
{
g_return_val_if_fail( NA_IS_PIVOT( pivot ), NULL );
g_return_val_if_fail( FMA_IS_PIVOT( pivot ), NULL );
if( !st_io_providers ){
st_io_providers = io_providers_list_add_from_write_order( pivot, NULL );
......@@ -407,7 +407,7 @@ fma_io_provider_get_io_providers_list( const NAPivot *pivot )
* without having any pointer to the underlying FMAIIOProvider (if it exists)
*/
static GList *
io_providers_list_add_from_write_order( const NAPivot *pivot, GList *objects_list )
io_providers_list_add_from_write_order( const FMAPivot *pivot, GList *objects_list )
{
GList *merged;
GSList *io_providers, *it;
......@@ -431,7 +431,7 @@ io_providers_list_add_from_write_order( const NAPivot *pivot, GList *objects_lis
* to implement the FMAIIOProvider interface
*/
static GList *
io_providers_list_add_from_plugins( const NAPivot *pivot, GList *objects_list )
io_providers_list_add_from_plugins( const FMAPivot *pivot, GList *objects_list )
{
static const gchar *thisfn = "fma_io_provider_io_providers_list_add_from_plugins";
GList *merged;
......@@ -440,7 +440,7 @@ io_providers_list_add_from_plugins( const NAPivot *pivot, GList *objects_list )
FMAIIOProvider *provider_module;
merged = objects_list;
modules_list = na_pivot_get_providers( pivot, FMA_TYPE_IIO_PROVIDER );
modules_list = fma_pivot_get_providers( pivot, FMA_TYPE_IIO_PROVIDER );
for( im = modules_list ; im ; im = im->next ){
......@@ -464,7 +464,7 @@ io_providers_list_add_from_plugins( const NAPivot *pivot, GList *objects_list )
}
}
na_pivot_free_providers( modules_list );
fma_pivot_free_providers( modules_list );
return( merged );
}
......@@ -476,7 +476,7 @@ io_providers_list_add_from_plugins( const NAPivot *pivot, GList *objects_list )
* preferences come from the io-providers status.
*/
static GList *
io_providers_list_add_from_prefs( const NAPivot *pivot, GList *objects_list )
io_providers_list_add_from_prefs( const FMAPivot *pivot, GList *objects_list )
{
GList *merged;
const gchar *id;
......@@ -543,7 +543,7 @@ io_providers_get_from_prefs( void )
* if it does not have been already registered
*/
static GList *
io_providers_list_append_object( const NAPivot *pivot, GList *list, FMAIIOProvider *module, const gchar *id )
io_providers_list_append_object( const FMAPivot *pivot, GList *list, FMAIIOProvider *module, const gchar *id )
{
GList *merged;
FMAIOProvider *object;
......@@ -584,7 +584,7 @@ peek_provider_by_id( const GList *providers, const gchar *id )
* module may be NULL
*/
static FMAIOProvider *
io_provider_new( const NAPivot *pivot, FMAIIOProvider *module, const gchar *id )
io_provider_new( const FMAPivot *pivot, FMAIIOProvider *module, const gchar *id )
{
FMAIOProvider *object;
......@@ -601,17 +601,17 @@ io_provider_new( const NAPivot *pivot, FMAIIOProvider *module, const gchar *id )
/*
* when a IIOProvider plugin is associated with the FMAIOProvider object,
* we connect the NAPivot callback to the 'item-changed' signal
* we connect the FMAPivot callback to the 'item-changed' signal
*/
static void
io_providers_list_set_module( const NAPivot *pivot, FMAIOProvider *provider_object, FMAIIOProvider *provider_module )
io_providers_list_set_module( const FMAPivot *pivot, FMAIOProvider *provider_object, FMAIIOProvider *provider_module )
{
provider_object->private->provider = g_object_ref( provider_module );
provider_object->private->item_changed_handler =
g_signal_connect(
provider_module, IO_PROVIDER_SIGNAL_ITEM_CHANGED,
( GCallback ) na_pivot_on_item_changed_handler, ( gpointer ) pivot );
( GCallback ) fma_pivot_on_item_changed_handler, ( gpointer ) pivot );
provider_object->private->writable =
is_finally_writable( provider_object, pivot, &provider_object->private->reason );
......@@ -626,7 +626,7 @@ io_providers_list_set_module( const NAPivot *pivot, FMAIOProvider *provider_obje
/*
* fma_io_provider_unref_io_providers_list:
*
* Called by on #NAPivot dispose(), free here resources allocated to
* Called by on #FMAPivot dispose(), free here resources allocated to
* the I/O providers.
*/
void
......@@ -730,7 +730,7 @@ fma_io_provider_is_available( const FMAIOProvider *provider )
/*
* fma_io_provider_is_conf_readable:
* @provider: this #FMAIOProvider.
* @pivot: the #NAPivot application object.
* @pivot: the #FMAPivot application object.
* @mandatory: a pointer to a boolean which will be set to %TRUE if the
* preference is mandatory; may be %NULL.
*
......@@ -744,13 +744,13 @@ fma_io_provider_is_available( const FMAIOProvider *provider )
* - whether this flag has been set as mandatory by an admin.
*/
gboolean
fma_io_provider_is_conf_readable( const FMAIOProvider *provider, const NAPivot *pivot, gboolean *mandatory )
fma_io_provider_is_conf_readable( const FMAIOProvider *provider, const FMAPivot *pivot, gboolean *mandatory )
{
gboolean readable;
gchar *group;
g_return_val_if_fail( FMA_IS_IO_PROVIDER( provider ), FALSE );
g_return_val_if_fail( NA_IS_PIVOT( pivot ), FALSE );
g_return_val_if_fail( FMA_IS_PIVOT( pivot ), FALSE );
readable = FALSE;
......@@ -767,7 +767,7 @@ fma_io_provider_is_conf_readable( const FMAIOProvider *provider, const NAPivot *
/*
* fma_io_provider_is_conf_writable:
* @provider: this #FMAIOProvider.
* @pivot: the #NAPivot application object.
* @pivot: the #FMAPivot application object.
* @mandatory: a pointer to a boolean which will be set to %TRUE if the
* preference is mandatory; may be %NULL.
*
......@@ -783,12 +783,12 @@ fma_io_provider_is_conf_readable( const FMAIOProvider *provider, const NAPivot *
* FMAIIOProvider module. See also is_willing_to() and is_able_to().
*/
gboolean
fma_io_provider_is_conf_writable( const FMAIOProvider *provider, const NAPivot *pivot, gboolean *mandatory )
fma_io_provider_is_conf_writable( const FMAIOProvider *provider, const FMAPivot *pivot, gboolean *mandatory )
{
gboolean is_writable;
g_return_val_if_fail( FMA_IS_IO_PROVIDER( provider ), FALSE );
g_return_val_if_fail( NA_IS_PIVOT( pivot ), FALSE );
g_return_val_if_fail( FMA_IS_PIVOT( pivot ), FALSE );
is_writable = FALSE;
......@@ -832,10 +832,10 @@ fma_io_provider_is_finally_writable( const FMAIOProvider *provider, guint *reaso
/*
* fma_io_provider_load_items:
* @pivot: the #NAPivot object which owns the list of registered I/O
* @pivot: the #FMAPivot object which owns the list of registered I/O
* storage providers.
* @loadable_set: the set of loadable items
* (cf. NAPivotLoadableSet enumeration defined in core/na-pivot.h).
* (cf. FMAPivotLoadableSet enumeration defined in core/fma-pivot.h).
* @messages: error messages.
*
* Loads the tree from I/O storage subsystems.
......@@ -847,14 +847,14 @@ fma_io_provider_is_finally_writable( const FMAIOProvider *provider, guint *reaso
* The returned list should be fma_object_free_items().
*/
GList *
fma_io_provider_load_items( const NAPivot *pivot, guint loadable_set, GSList **messages )
fma_io_provider_load_items( const FMAPivot *pivot, guint loadable_set, GSList **messages )
{
static const gchar *thisfn = "fma_io_provider_load_items";
GList *flat, *hierarchy, *filtered;
GSList *level_zero;
guint order_mode;
g_return_val_if_fail( NA_IS_PIVOT( pivot ), NULL );
g_return_val_if_fail( FMA_IS_PIVOT( pivot ), NULL );
g_debug( "%s: pivot=%p, loadable_set=%d, messages=%p",
thisfn, ( void * ) pivot, loadable_set, ( void * ) messages );
......@@ -942,7 +942,7 @@ dump_providers_list( GList *providers )
#endif
static gboolean
is_conf_writable( const FMAIOProvider *provider, const NAPivot *pivot, gboolean *mandatory )
is_conf_writable( const FMAIOProvider *provider, const FMAPivot *pivot, gboolean *mandatory )
{
gchar *group;
gboolean is_writable;
......@@ -959,7 +959,7 @@ is_conf_writable( const FMAIOProvider *provider, const NAPivot *pivot, gboolean
* This same status may later be reevaluated on demand.
*/
static gboolean
is_finally_writable( const FMAIOProvider *provider, const NAPivot *pivot, guint *reason )
is_finally_writable( const FMAIOProvider *provider, const FMAPivot *pivot, guint *reason )
{
static const gchar *thisfn = "fma_io_provider_is_finally_writable";
gboolean writable;
......@@ -1019,7 +1019,7 @@ is_finally_writable( const FMAIOProvider *provider, const NAPivot *pivot, guint
}
static GList *
load_items_filter_unwanted_items( const NAPivot *pivot, GList *hierarchy, guint loadable_set )
load_items_filter_unwanted_items( const FMAPivot *pivot, GList *hierarchy, guint loadable_set )
{
GList *it;
GList *filtered;
......@@ -1101,7 +1101,7 @@ load_items_filter_unwanted_items_rec( GList *hierarchy, guint loadable_set )
* - items (actions or menus) which do not satisfy the defined loadable set
*/
static GList *
load_items_get_merged_list( const NAPivot *pivot, guint loadable_set, GSList **messages )
load_items_get_merged_list( const FMAPivot *pivot, guint loadable_set, GSList **messages )
{
const GList *providers;
const GList *ip;
......@@ -1190,7 +1190,7 @@ load_items_hierarchy_build( GList **tree, GSList *level_zero, gboolean list_if_e
}
static GList *
load_items_hierarchy_sort( const NAPivot *pivot, GList *tree, GCompareFunc fn )
load_items_hierarchy_sort( const FMAPivot *pivot, GList *tree, GCompareFunc fn )
{
GList *sorted;
GList *items, *it;
......@@ -1238,7 +1238,7 @@ peek_item_by_id_compare( const FMAObject *obj, const gchar *id )
*
* Returns: the FMAIIOProvider return code.
*
* #NAPivot class, which should be the only caller of this function,
* #FMAPivot class, which should be the only caller of this function,
* has already check that this item is writable, i.e. that all conditions
* are met to be able to successfully write the item down to the
* storage subsystem.
......
......@@ -59,7 +59,7 @@
* and the whole configuration must not have been locked by an admin.
*/
#include "na-pivot.h"
#include "fma-pivot.h"
G_BEGIN_DECLS
......@@ -95,19 +95,19 @@ typedef struct {
GType fma_io_provider_get_type ( void );
FMAIOProvider *fma_io_provider_find_writable_io_provider( const NAPivot *pivot );
FMAIOProvider *fma_io_provider_find_io_provider_by_id ( const NAPivot *pivot, const gchar *id );
const GList *fma_io_provider_get_io_providers_list ( const NAPivot *pivot );
FMAIOProvider *fma_io_provider_find_writable_io_provider( const FMAPivot *pivot );
FMAIOProvider *fma_io_provider_find_io_provider_by_id ( const FMAPivot *pivot, const gchar *id );
const GList *fma_io_provider_get_io_providers_list ( const FMAPivot *pivot );
void fma_io_provider_unref_io_providers_list ( void );
gchar *fma_io_provider_get_id ( const FMAIOProvider *provider );
gchar *fma_io_provider_get_name ( const FMAIOProvider *provider );
gboolean fma_io_provider_is_available ( const FMAIOProvider *provider );
gboolean fma_io_provider_is_conf_readable ( const FMAIOProvider *provider, const NAPivot *pivot, gboolean *mandatory );
gboolean fma_io_provider_is_conf_writable ( const FMAIOProvider *provider, const NAPivot *pivot, gboolean *mandatory );
gboolean fma_io_provider_is_conf_readable ( const FMAIOProvider *provider, const FMAPivot *pivot, gboolean *mandatory );
gboolean fma_io_provider_is_conf_writable ( const FMAIOProvider *provider, const FMAPivot *pivot, gboolean *mandatory );
gboolean fma_io_provider_is_finally_writable ( const FMAIOProvider *provider, guint *reason );
GList *fma_io_provider_load_items ( const NAPivot *pivot, guint loadable_set, GSList **messages );
GList *fma_io_provider_load_items ( const FMAPivot *pivot, guint loadable_set, GSList **messages );
guint fma_io_provider_write_item ( const FMAIOProvider *provider, const FMAObjectItem *item, GSList **messages );
guint fma_io_provider_delete_item ( const FMAIOProvider *provider, const FMAObjectItem *item, GSList **messages );
......
......@@ -39,7 +39,7 @@
* preferences.
*/
#include "na-pivot.h"
#include "fma-pivot.h"
G_BEGIN_DECLS
......
......@@ -517,7 +517,7 @@ fma_module_has_id( FMAModule *module, const gchar *id )
* fma_module_release_modules:
* @modules: the list of loaded modules.
*
* Release resources allocated to the loaded modules on #NAPivot dispose.
* Release resources allocated to the loaded modules on #FMAPivot dispose.
*/
void
fma_module_release_modules( GList *modules )
......
......@@ -49,15 +49,15 @@
* which are dynamically instantiated at plugin initial-load time.
*
* So the dynamic is as follows:
* - NAPivot scans for the PKGLIBDIR directory, trying to dynamically
* - FMAPivot scans for the PKGLIBDIR directory, trying to dynamically
* load all found libraries
* - to be considered as a N-A plugin, a library must implement some
* functions (see api/na-api.h)
* - for each found plugin, NAPivot calls na_api_list_types() which
* - for each found plugin, FMAPivot calls na_api_list_types() which
* returns the type of GObjects implemented in the plugin
* - NAPivot dynamically instantiates a GObject for each returned GType.
* - FMAPivot dynamically instantiates a GObject for each returned GType.
*
* After that, when NAPivot wants to access, say to FMAIIOProvider
* After that, when FMAPivot wants to access, say to FMAIIOProvider
* interfaces, it asks each module for its list of objects which implement
* this given interface.
* Interface API is then called against the returned GObject.
......
......@@ -38,17 +38,17 @@
#include "fma-io-provider.h"
#include "fma-module.h"
#include "na-pivot.h"
#include "fma-pivot.h"
/* private class data
*/
struct _NAPivotClassPrivate {
struct _FMAPivotClassPrivate {
void *empty; /* so that gcc -pedantic is happy */
};
/* private instance data
*/
struct _NAPivotPrivate {
struct _FMAPivotPrivate {
gboolean dispose_has_run;
guint loadable_set;
......@@ -66,7 +66,7 @@ struct _NAPivotPrivate {
FMATimeout change_timeout;
};
/* NAPivot properties
/* FMAPivot properties
*/
enum {
PRIVOT_PROP_0,
......@@ -90,7 +90,7 @@ static gint st_burst_timeout = 100; /* burst timeout in msec
static gint st_signals[ LAST_SIGNAL ] = { 0 };
static GType register_type( void );
static void class_init( NAPivotClass *klass );
static void class_init( FMAPivotClass *klass );
static void instance_init( GTypeInstance *instance, gpointer klass );
static void instance_constructed( GObject *object );
static void instance_get_property( GObject *object, guint property_id, GValue *value, GParamSpec *spec );
......@@ -98,13 +98,13 @@ static void instance_set_property( GObject *object, guint property_id,
static void instance_dispose( GObject *object );
static void instance_finalize( GObject *object );
static FMAObjectItem *get_item_from_tree( const NAPivot *pivot, GList *tree, const gchar *id );
static FMAObjectItem *get_item_from_tree( const FMAPivot *pivot, GList *tree, const gchar *id );
/* FMAIIOProvider management */
static void on_items_changed_timeout( NAPivot *pivot );
static void on_items_changed_timeout( FMAPivot *pivot );
GType
na_pivot_get_type( void )
fma_pivot_get_type( void )
{
static GType object_type = 0;
......@@ -118,32 +118,32 @@ na_pivot_get_type( void )
static GType
register_type( void )
{
static const gchar *thisfn = "na_pivot_register_type";
static const gchar *thisfn = "fma_pivot_register_type";
GType type;
static GTypeInfo info = {
sizeof( NAPivotClass ),
sizeof( FMAPivotClass ),
( GBaseInitFunc ) NULL,