[nautilus-actions/file-manager-actions] NABoxed is renamed to FMABoxed
- From: Pierre Wieser <pwieser src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus-actions/file-manager-actions] NABoxed is renamed to FMABoxed
- Date: Mon, 7 Sep 2015 22:08:21 +0000 (UTC)
commit 8dfce4a6155a2e6f01b2ddcd79a107c827b8c8a9
Author: Pierre Wieser <pwieser trychlos org>
Date: Mon Sep 7 20:28:11 2015 +0200
NABoxed is renamed to FMABoxed
README | 16 +-
README-GCONF | 78 +++--
nautilus-actions.doap | 10 +-
src/api/Makefile.am | 2 +-
src/api/README | 6 +-
src/api/fma-boxed.h | 98 ++++++
src/api/na-boxed.h | 98 ------
src/api/na-core-utils.h | 6 +-
src/api/na-data-boxed.h | 14 +-
src/api/na-data-def.h | 6 +-
src/api/na-data-types.h | 8 +-
src/api/na-dbus.h | 6 +-
src/api/na-extension.h | 6 +-
src/api/na-gconf-monitor.h | 6 +-
src/api/na-gconf-utils.h | 6 +-
src/api/na-icontext.h | 6 +-
src/api/na-iduplicable.h | 6 +-
src/api/na-iexporter.h | 6 +-
src/api/na-ifactory-object-data.h | 6 +-
src/api/na-ifactory-object.h | 6 +-
src/api/na-ifactory-provider-provider.h | 6 +-
src/api/na-ifactory-provider.h | 6 +-
src/api/na-iimporter.h | 6 +-
src/api/na-iio-provider.h | 6 +-
src/api/na-object-action.h | 6 +-
src/api/na-object-api.h | 6 +-
src/api/na-object-id.h | 6 +-
src/api/na-object-item.h | 6 +-
src/api/na-object-menu.h | 6 +-
src/api/na-object-profile.h | 6 +-
src/api/na-object.h | 6 +-
src/api/na-timeout.h | 6 +-
src/core/Makefile.am | 2 +-
src/core/README | 6 +-
src/core/{na-boxed.c => fma-boxed.c} | 576 +++++++++++++++---------------
src/core/na-data-boxed.c | 62 ++--
src/core/na-factory-object.c | 22 +-
src/core/na-settings.c | 38 +-
src/io-desktop/nadp-reader.c | 10 +-
src/io-desktop/nadp-writer.c | 10 +-
src/io-gconf/nagp-reader.c | 8 +-
src/io-gconf/nagp-writer.c | 10 +-
src/io-xml/naxml-reader.c | 6 +-
src/io-xml/naxml-writer.c | 6 +-
src/nact/Makefile.am | 8 +-
src/plugin-menu/Makefile.am | 6 +-
src/plugin-menu/README | 6 +-
src/plugin-menu/nautilus-actions.c | 2 +-
src/plugin-menu/nautilus-module.c | 2 +-
src/plugin-tracker/Makefile.am | 2 +-
src/utils/Makefile.am | 20 +-
src/utils/nautilus-actions-run.c | 2 +-
52 files changed, 646 insertions(+), 626 deletions(-)
---
diff --git a/README b/README
index 1de1acf..c8115c7 100644
--- a/README
+++ b/README
@@ -1,12 +1,12 @@
-Nautilus-Actions
+FileManager-Actions
Nautilus-actions is an extension for Nautilus file manager which
allows the user to add arbitrary program to be launched through the
Nautilus file manager popup menu of selected files.
-Nautilus-Actions components.
+FileManager-Actions components.
- Nautilus-Actions has three sort of components:
+ FileManager-Actions has three sort of components:
- A user interface, nautilus-actions-config-tool (NACT), which let you
manage your actions. With NACT, you are able to create, modify and
@@ -34,11 +34,11 @@ Nautilus-Actions components.
. na-gconf2keys.sh migrates menus, actions and user preferences from
GConf to files.
-Nautilus-Actions plugins.
+FileManager-Actions plugins.
I/O Providers.
- Nautilus-Actions itself uses plugins to load menus and actions from
+ FileManager-Actions itself uses plugins to load menus and actions from
the storage space. These plugins are installed in PKGLIBDIR, usually
something as /usr/lib/nautilus-actions/.
@@ -48,15 +48,15 @@ Nautilus-Actions plugins.
Importers/Exporters.
- Nautilus-Actions also relies on plugins to import actions and menus,
+ FileManager-Actions also relies on plugins to import actions and menus,
and to export them, in several formats.
- For now, Nautilus-Actions is able to import/export its items as:
+ For now, FileManager-Actions is able to import/export its items as:
. GConf schemas;
. GConf dump;
. XML;
. .desktop files.
-Nautilus-Actions documentation.
+FileManager-Actions documentation.
Documentation is provided in several formats:
- developer documentation is provided as xml and html files, as generated
diff --git a/README-GCONF b/README-GCONF
index 3e41dc1..835f465 100644
--- a/README-GCONF
+++ b/README-GCONF
@@ -1,64 +1,71 @@
Deprecating GConf
=================
- Gnome is deprecating GConf in favour of GSettings. This is the short story.
- We so have to migrate several pool of datas.
+ Gnome is deprecating GConf in favour of GSettings. This is the short
+ story. We so have to migrate several pool of datas.
- Starting with 3.1.0, Nautilus-Actions is distributed with the needed migration
- tools, whether the migration may occur automatically (for users items and
- preferences), or the system admin must run a script (for mandatory items).
+ Starting with 3.1.0, Nautilus-Actions has been distributed with the
+ needed migration tools, whether the migration may occur automatically
+ (for users items and preferences), or the system admin must run a
+ script (for mandatory items).
- Note that this does not break backward compatibility. The 3.1.x serie of
- Nautilus-Actions may still be run on a "old" platform. The oldest supported
- as of January 2011 is Ubuntu 8 LTS.
+ Note that this does not break backward compatibility. The 3.1.x serie
+ of Nautilus-Actions may still be run on a "old" platform. The oldest
+ supported as of January 2011 was Ubuntu 8 LTS.
+
+ See README for the oldest supported platforms for the current version.
1. Items, menus and actions, stored in GConf backend
----------------------------------------------------
- Historically, actions, then menus, were stored in GConf. These are user items.
+ Historically, actions, then menus, were stored in GConf. These are user
+ items.
- A system admin was free to define mandatory menus and actions, and to store
- them in the Mandatory pool of GConf. Such defined items are so available to
- all users, though as read-only items.
+ A system admin was free to define mandatory menus and actions, and to
+ store them in the Mandatory pool of GConf. Such defined items are so
+ available to all users, though as read-only items.
1a. Migrating user items
------------------------
The good news is:
user items are automatically migrated from GConf to .desktop files.
- The migration happens when the user runs the Nautilus-Actions Configuration
- Tool user interface, or when the Nautilus-Actions menu plugin is loaded
- by the Nautilus file-manager, or when the user runs one of the command-line
- tools nautilus-actions-new or nautilus-actions-run.
+ The migration happens when the user runs the FileManager-Actions
+ Configuration Tool user interface, or when the FileManager-Actions
+ menu plugin is loaded by the file-manager, or when the user runs one
+ of the command-line tools fma-new or fma-run.
- The nautilus-actions-print command-line tool, along with na-delete-xmltree,
- and na-print-schemas installed in PKGLIBEXECDIR, have no effect on the
- migration process.
+ The fma-print command-line tool, along with fma-delete-xmltree,
+ and fma-print-schemas installed in PKGLIBEXECDIR, have no effect on
+ the migration process.
The new .desktop files are stored in HOME/.local/file-manager/actions.
- When the migration of its items has occurred, the GConf I/O Provider is
- disabled, both for reading and writing.
+ When the migration of its items has occurred, the GConf I/O Provider
+ is disabled, for both reading and writing.
1b. Migrating mandatory items
-----------------------------
The bad news is:
- the system admin has to manually run PKGLIBEXECDIR/na-gconf2key.sh script
- as root in order to migrate existing mandatory items to .desktop files.
+ the system admin has to manually run PKGLIBEXECDIR/fma-gconf2key.sh
+ script as root in order to migrate existing mandatory items to
+ .desktop files.
The new .desktop files default to be stored in /usr/share/file-manager/actions.
- It is enough to run this script once, e.g. when installing for the first time
- a recent enough version (>= 3.1.0) of Nautilus-Actions.
+ It is enough to run this script once, e.g. when installing for the
+ first time a recent enough version (>= 3.1.0) of FileManager-Actions.
Command-line example:
- # /usr/libexec/nautilus-actions/na-gconf2key.sh -delete -nodummy
+ # /usr/libexec/file-manager-actions/fma-gconf2key.sh -delete -nodummy
2. User preferences stored in GConf
-----------------------------------
- Mandatory and user preferences follow the same migration rules that items:
+ Mandatory and user preferences follow the same migration rules that
+ items:
- user preferences are automatically migrated,
- - mandatory preferences have to be manually migrated by the system admin.
+ - mandatory preferences have to be manually migrated by the system
+ admin.
Preferences are renamed and reorganized:
@@ -113,8 +120,9 @@ Deprecating GConf
schemes = [dav|WebDAV files,file|Local files,ftp|FTP files,sftp|SSH files,smb|Windows files]
[nact] scheme-default-list
- User preferences for I/O providers were stored as /apps/nautilus-actions/io-providers/<provider_id>
- keys. They are moved to [io-provider <provider_id>] group.
+ User preferences for I/O providers were stored as
+ /apps/nautilus-actions/io-providers/<provider_id> keys. They are moved
+ to [io-provider <provider_id>] group.
GConf Key
----------------------------------------- --------------------------------------
@@ -129,11 +137,11 @@ Deprecating GConf
na-desktop/locked
na-gconf/locked
- These keys are just ignored if they are not in the mandatory GConf pool, i.e.
- if they happens to be eventually editable by the user.
+ These keys are just ignored if they are not in the mandatory GConf
+ pool, i.e. if they happens to be eventually editable by the user.
- If these keys are actually in the system mandatory GConf pool, they are renamed
- in the following way:
+ If these keys are actually in the system mandatory GConf pool, they
+ are renamed in the following way:
GConf Group Key
----------------------------------------- ------ --------------------------------------
@@ -144,4 +152,4 @@ Deprecating GConf
/apps/nautilus-actions/mandatory/na-desktop/locked <removed>
/apps/nautilus-actions/mandatory/na-gconf/locked <removed>
-P. Wieser - Jan. 2011
+P. Wieser, last updated on sept. 2015
diff --git a/nautilus-actions.doap b/nautilus-actions.doap
index a746f8d..5e7b53a 100644
--- a/nautilus-actions.doap
+++ b/nautilus-actions.doap
@@ -8,13 +8,13 @@
<category rdf:resource="http://api.gnome.org/doap-extensions#desktop"; />
- <shortdesc xml:lang="en">Nautilus extension which offers user configurable context menu actions</shortdesc>
+ <shortdesc xml:lang="en">A file-manager extension which offers user configurable context menu
actions</shortdesc>
<description xml:lang="en">
- FileManager-Actions is a Nautilus extension whose principal function
- is to allow the user to add arbitrary actions to the file manager
- context menus. These actions may be organized in menus and submenus,
- exported and shared with other desktop environments.
+ FileManager-Actions is a file-manager extension whose principal
+ function is to allow the user to add arbitrary actions to the
+ file-manager context menus. These actions may be organized in menus
+ and submenus, exported and shared with other desktop environments.
</description>
<homepage rdf:resource="http://www.nautilus-actions.org"; />
diff --git a/src/api/Makefile.am b/src/api/Makefile.am
index fdbb554..3bfc346 100644
--- a/src/api/Makefile.am
+++ b/src/api/Makefile.am
@@ -37,7 +37,7 @@ api_include_HEADERS = \
na-ifactory-provider-provider.h \
na-iio-provider.h \
\
- na-boxed.h \
+ fma-boxed.h \
na-core-utils.h \
na-data-boxed.h \
na-data-def.h \
diff --git a/src/api/README b/src/api/README
index f604ca6..a6adf94 100644
--- a/src/api/README
+++ b/src/api/README
@@ -1,4 +1,6 @@
-This is the Nautilus-Actions extension interface.
+src/api
+-------
+This is the FileManager-Actions extension interface.
Each extension library should at least implement the interface defined
in na-extension.h.
@@ -6,3 +8,5 @@ in na-extension.h.
Headers are installed as part of a development environment of such an
extension. They are to be included by the extension as
'#include <file-manager-actions/header.h>'.
+
+P. Wieser, last updated on sept. 2015
diff --git a/src/api/fma-boxed.h b/src/api/fma-boxed.h
new file mode 100644
index 0000000..470a2de
--- /dev/null
+++ b/src/api/fma-boxed.h
@@ -0,0 +1,98 @@
+/*
+ * FileManager-Actions
+ * A file-manager extension which offers configurable context menu actions.
+ *
+ * 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 __FILE_MANAGER_ACTIONS_API_FMA_BOXED_H__
+#define __FILE_MANAGER_ACTIONS_API_FMA_BOXED_H__
+
+/**
+ * SECTION: boxed
+ * @title: FMABoxed
+ * @short_description: The FMABoxed Structure
+ * @include: file-manager-actions/fma-boxed.h
+ *
+ * The FMABoxed structure is a way of handling various types of data in an
+ * opaque structure.
+ *
+ * Since: 3.1
+ */
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define FMA_TYPE_BOXED ( fma_boxed_get_type())
+#define FMA_BOXED( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, FMA_TYPE_BOXED, FMABoxed ))
+#define FMA_BOXED_CLASS( klass ) ( G_TYPE_CHECK_CLASS_CAST( klass, FMA_TYPE_BOXED, FMABoxedClass ))
+#define FMA_IS_BOXED( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, FMA_TYPE_BOXED))
+#define FMA_IS_BOXED_CLASS( klass ) ( G_TYPE_CHECK_CLASS_TYPE(( klass ), FMA_TYPE_BOXED))
+#define FMA_BOXED_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), FMA_TYPE_BOXED, FMABoxedClass
))
+
+typedef struct _FMABoxedPrivate FMABoxedPrivate;
+
+typedef struct {
+ /*< private >*/
+ GObject parent;
+ FMABoxedPrivate *private;
+}
+ FMABoxed;
+
+typedef struct _FMABoxedClassPrivate FMABoxedClassPrivate;
+
+typedef struct {
+ /*< private >*/
+ GObjectClass parent;
+ FMABoxedClassPrivate *private;
+}
+ FMABoxedClass;
+
+GType fma_boxed_get_type ( void );
+void fma_boxed_set_type ( FMABoxed *boxed, guint type );
+
+gboolean fma_boxed_are_equal ( const FMABoxed *a, const FMABoxed *b );
+FMABoxed *fma_boxed_copy ( const FMABoxed *boxed );
+void fma_boxed_dump ( const FMABoxed *boxed );
+FMABoxed *fma_boxed_new_from_string( guint type, const gchar *string );
+
+gboolean fma_boxed_get_boolean ( const FMABoxed *boxed );
+gconstpointer fma_boxed_get_pointer ( const FMABoxed *boxed );
+gchar *fma_boxed_get_string ( const FMABoxed *boxed );
+GSList *fma_boxed_get_string_list( const FMABoxed *boxed );
+guint fma_boxed_get_uint ( const FMABoxed *boxed );
+GList *fma_boxed_get_uint_list ( const FMABoxed *boxed );
+void fma_boxed_get_as_value ( const FMABoxed *boxed, GValue *value );
+void *fma_boxed_get_as_void ( const FMABoxed *boxed );
+
+void fma_boxed_set_from_boxed ( FMABoxed *boxed, const FMABoxed *value );
+void fma_boxed_set_from_string( FMABoxed *boxed, const gchar *value );
+void fma_boxed_set_from_value ( FMABoxed *boxed, const GValue *value );
+void fma_boxed_set_from_void ( FMABoxed *boxed, const void *value );
+
+G_END_DECLS
+
+#endif /* __FILE_MANAGER_ACTIONS_API_FMA_BOXED_H__ */
diff --git a/src/api/na-core-utils.h b/src/api/na-core-utils.h
index cebde32..fd39747 100644
--- a/src/api/na-core-utils.h
+++ b/src/api/na-core-utils.h
@@ -27,8 +27,8 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __NAUTILUS_ACTIONS_API_NA_CORE_UTILS_H__
-#define __NAUTILUS_ACTIONS_API_NA_CORE_UTILS_H__
+#ifndef __FILE_MANAGER_ACTIONS_API_NA_CORE_UTILS_H__
+#define __FILE_MANAGER_ACTIONS_API_NA_CORE_UTILS_H__
/**
* SECTION: core-utils
@@ -103,4 +103,4 @@ void na_core_utils_print_version( void );
G_END_DECLS
-#endif /* __NAUTILUS_ACTIONS_API_NA_CORE_UTILS_H__ */
+#endif /* __FILE_MANAGER_ACTIONS_API_NA_CORE_UTILS_H__ */
diff --git a/src/api/na-data-boxed.h b/src/api/na-data-boxed.h
index bf9d9f2..2591ff1 100644
--- a/src/api/na-data-boxed.h
+++ b/src/api/na-data-boxed.h
@@ -27,8 +27,8 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __NAUTILUS_ACTIONS_API_NA_DATA_BOXED_H__
-#define __NAUTILUS_ACTIONS_API_NA_DATA_BOXED_H__
+#ifndef __FILE_MANAGER_ACTIONS_API_NA_DATA_BOXED_H__
+#define __FILE_MANAGER_ACTIONS_API_NA_DATA_BOXED_H__
/**
* SECTION: data-boxed
@@ -39,7 +39,7 @@
* The object which encapsulates an elementary data of #NAIFactoryObject.
* A #NADataBoxed object has a type and a value.
*
- * #NADataBoxed class is derived from #NABoxed one, and implements the same
+ * #NADataBoxed class is derived from #FMABoxed one, and implements the same
* types that those defined in na-data-types.h.
*
* Additionally, #NADataBoxed class holds the #NADataDef data definition
@@ -51,7 +51,7 @@
#include <glib-object.h>
-#include "na-boxed.h"
+#include "fma-boxed.h"
#include "na-data-def.h"
G_BEGIN_DECLS
@@ -67,7 +67,7 @@ typedef struct _NADataBoxedPrivate NADataBoxedPrivate;
typedef struct {
/*< private >*/
- NABoxed parent;
+ FMABoxed parent;
NADataBoxedPrivate *private;
}
NADataBoxed;
@@ -76,7 +76,7 @@ typedef struct _NADataBoxedClassPrivate NADataBoxedClassPrivate;
typedef struct {
/*< private >*/
- NABoxedClass parent;
+ FMABoxedClass parent;
NADataBoxedClassPrivate *private;
}
NADataBoxedClass;
@@ -109,4 +109,4 @@ void na_data_boxed_set_from_void ( NADataBoxed *boxed, const void *
G_END_DECLS
-#endif /* __NAUTILUS_ACTIONS_API_NA_DATA_BOXED_H__ */
+#endif /* __FILE_MANAGER_ACTIONS_API_NA_DATA_BOXED_H__ */
diff --git a/src/api/na-data-def.h b/src/api/na-data-def.h
index 609d2e2..be98840 100644
--- a/src/api/na-data-def.h
+++ b/src/api/na-data-def.h
@@ -27,8 +27,8 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __NAUTILUS_ACTIONS_API_NA_FACTORY_DATA_DEF_H__
-#define __NAUTILUS_ACTIONS_API_NA_FACTORY_DATA_DEF_H__
+#ifndef __FILE_MANAGER_ACTIONS_API_NA_FACTORY_DATA_DEF_H__
+#define __FILE_MANAGER_ACTIONS_API_NA_FACTORY_DATA_DEF_H__
/**
* SECTION: data-def
@@ -142,4 +142,4 @@ const NADataDef *na_data_def_get_data_def( const NADataGroup *group, const gchar
G_END_DECLS
-#endif /* __NAUTILUS_ACTIONS_API_NA_FACTORY_DATA_DEF_H__ */
+#endif /* __FILE_MANAGER_ACTIONS_API_NA_FACTORY_DATA_DEF_H__ */
diff --git a/src/api/na-data-types.h b/src/api/na-data-types.h
index 3ef5b90..563803a 100644
--- a/src/api/na-data-types.h
+++ b/src/api/na-data-types.h
@@ -27,8 +27,8 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __NAUTILUS_ACTIONS_API_NA_DATA_TYPES_H__
-#define __NAUTILUS_ACTIONS_API_NA_DATA_TYPES_H__
+#ifndef __FILE_MANAGER_ACTIONS_API_NA_DATA_TYPES_H__
+#define __FILE_MANAGER_ACTIONS_API_NA_DATA_TYPES_H__
/**
* SECTION: data-type
@@ -52,7 +52,7 @@ G_BEGIN_DECLS
* @NA_DATA_TYPE_UINT: an unsigned integer
* @NA_DATA_TYPE_UINT_LIST: a list of unsigned integers
*
- * Each elementary data which would take advantage of #NABoxed facilities
+ * Each elementary data which would take advantage of #FMABoxed facilities
* should be typed at instanciation time.
*
* #NAIFactoryProvider implementations should provide a primitive for reading
@@ -91,4 +91,4 @@ const gchar *na_data_types_get_gconf_dump_key( guint type );
G_END_DECLS
-#endif /* __NAUTILUS_ACTIONS_API_NA_DATA_TYPES_H__ */
+#endif /* __FILE_MANAGER_ACTIONS_API_NA_DATA_TYPES_H__ */
diff --git a/src/api/na-dbus.h b/src/api/na-dbus.h
index 5f482e8..2cf35c2 100644
--- a/src/api/na-dbus.h
+++ b/src/api/na-dbus.h
@@ -27,8 +27,8 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __NAUTILUS_ACTIONS_API_NA_DBUS_H__
-#define __NAUTILUS_ACTIONS_API_NA_DBUS_H__
+#ifndef __FILE_MANAGER_ACTIONS_API_NA_DBUS_H__
+#define __FILE_MANAGER_ACTIONS_API_NA_DBUS_H__
/**
* SECTION: dbus
@@ -134,4 +134,4 @@ G_BEGIN_DECLS
G_END_DECLS
-#endif /* __NAUTILUS_ACTIONS_API_NA_DBUS_H__ */
+#endif /* __FILE_MANAGER_ACTIONS_API_NA_DBUS_H__ */
diff --git a/src/api/na-extension.h b/src/api/na-extension.h
index c89ccc9..7624889 100644
--- a/src/api/na-extension.h
+++ b/src/api/na-extension.h
@@ -27,8 +27,8 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __NAUTILUS_ACTIONS_API_NA_EXTENSION_H__
-#define __NAUTILUS_ACTIONS_API_NA_EXTENSION_H__
+#ifndef __FILE_MANAGER_ACTIONS_API_NA_EXTENSION_H__
+#define __FILE_MANAGER_ACTIONS_API_NA_EXTENSION_H__
/**
* SECTION: extension
@@ -291,4 +291,4 @@ void na_extension_shutdown ( void );
G_END_DECLS
-#endif /* __NAUTILUS_ACTIONS_API_NA_EXTENSION_H__ */
+#endif /* __FILE_MANAGER_ACTIONS_API_NA_EXTENSION_H__ */
diff --git a/src/api/na-gconf-monitor.h b/src/api/na-gconf-monitor.h
index 8bade9f..0001d77 100644
--- a/src/api/na-gconf-monitor.h
+++ b/src/api/na-gconf-monitor.h
@@ -27,8 +27,8 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __NAUTILUS_ACTIONS_API_NA_GCONF_MONITOR_H__
-#define __NAUTILUS_ACTIONS_API_NA_GCONF_MONITOR_H__
+#ifndef __FILE_MANAGER_ACTIONS_API_NA_GCONF_MONITOR_H__
+#define __FILE_MANAGER_ACTIONS_API_NA_GCONF_MONITOR_H__
#ifdef HAVE_GCONF
#ifdef NA_ENABLE_DEPRECATED
@@ -85,4 +85,4 @@ G_END_DECLS
#endif /* NA_ENABLE_DEPRECATED */
#endif /* HAVE_GCONF */
-#endif /* __NAUTILUS_ACTIONS_API_NA_GCONF_MONITOR_H__ */
+#endif /* __FILE_MANAGER_ACTIONS_API_NA_GCONF_MONITOR_H__ */
diff --git a/src/api/na-gconf-utils.h b/src/api/na-gconf-utils.h
index cf90d11..3cb0360 100644
--- a/src/api/na-gconf-utils.h
+++ b/src/api/na-gconf-utils.h
@@ -27,8 +27,8 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __NAUTILUS_ACTIONS_API_NA_GCONF_UTILS_H__
-#define __NAUTILUS_ACTIONS_API_NA_GCONF_UTILS_H__
+#ifndef __FILE_MANAGER_ACTIONS_API_NA_GCONF_UTILS_H__
+#define __FILE_MANAGER_ACTIONS_API_NA_GCONF_UTILS_H__
#ifdef HAVE_GCONF
/**
@@ -76,4 +76,4 @@ gchar *na_gconf_utils_slist_to_string ( GSList *slist );
G_END_DECLS
#endif /* HAVE_GCONF */
-#endif /* __NAUTILUS_ACTIONS_API_NA_GCONF_UTILS_H__ */
+#endif /* __FILE_MANAGER_ACTIONS_API_NA_GCONF_UTILS_H__ */
diff --git a/src/api/na-icontext.h b/src/api/na-icontext.h
index 34aa15a..c28dd72 100644
--- a/src/api/na-icontext.h
+++ b/src/api/na-icontext.h
@@ -27,8 +27,8 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __NAUTILUS_ACTIONS_API_NA_ICONTEXT_H__
-#define __NAUTILUS_ACTIONS_API_NA_ICONTEXT_H__
+#ifndef __FILE_MANAGER_ACTIONS_API_NA_ICONTEXT_H__
+#define __FILE_MANAGER_ACTIONS_API_NA_ICONTEXT_H__
/**
* SECTION: icontext
@@ -109,4 +109,4 @@ void na_icontext_replace_folder ( NAIContext *context, const gchar *old, co
G_END_DECLS
-#endif /* __NAUTILUS_ACTIONS_API_NA_ICONTEXT_H__ */
+#endif /* __FILE_MANAGER_ACTIONS_API_NA_ICONTEXT_H__ */
diff --git a/src/api/na-iduplicable.h b/src/api/na-iduplicable.h
index bd7abf3..469e830 100644
--- a/src/api/na-iduplicable.h
+++ b/src/api/na-iduplicable.h
@@ -27,8 +27,8 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __NAUTILUS_ACTIONS_API_NA_IDUPLICABLE_H__
-#define __NAUTILUS_ACTIONS_API_NA_IDUPLICABLE_H__
+#ifndef __FILE_MANAGER_ACTIONS_API_NA_IDUPLICABLE_H__
+#define __FILE_MANAGER_ACTIONS_API_NA_IDUPLICABLE_H__
/**
* SECTION: iduplicable
@@ -225,4 +225,4 @@ void na_iduplicable_set_modified( NAIDuplicable *object, gboolean modi
G_END_DECLS
-#endif /* __NAUTILUS_ACTIONS_API_NA_IDUPLICABLE_H__ */
+#endif /* __FILE_MANAGER_ACTIONS_API_NA_IDUPLICABLE_H__ */
diff --git a/src/api/na-iexporter.h b/src/api/na-iexporter.h
index a341bb6..e582b3c 100644
--- a/src/api/na-iexporter.h
+++ b/src/api/na-iexporter.h
@@ -27,8 +27,8 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __NAUTILUS_ACTIONS_API_NA_IEXPORTER_H__
-#define __NAUTILUS_ACTIONS_API_NA_IEXPORTER_H__
+#ifndef __FILE_MANAGER_ACTIONS_API_NA_IEXPORTER_H__
+#define __FILE_MANAGER_ACTIONS_API_NA_IEXPORTER_H__
/**
* SECTION: iexporter
@@ -539,4 +539,4 @@ GType na_iexporter_get_type( void );
G_END_DECLS
-#endif /* __NAUTILUS_ACTIONS_API_NA_IEXPORTER_H__ */
+#endif /* __FILE_MANAGER_ACTIONS_API_NA_IEXPORTER_H__ */
diff --git a/src/api/na-ifactory-object-data.h b/src/api/na-ifactory-object-data.h
index 03e1906..fc133cc 100644
--- a/src/api/na-ifactory-object-data.h
+++ b/src/api/na-ifactory-object-data.h
@@ -27,8 +27,8 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __NAUTILUS_ACTIONS_API_NA_IFACTORY_OBJECT_DATA_H__
-#define __NAUTILUS_ACTIONS_API_NA_IFACTORY_OBJECT_DATA_H__
+#ifndef __FILE_MANAGER_ACTIONS_API_NA_IFACTORY_OBJECT_DATA_H__
+#define __FILE_MANAGER_ACTIONS_API_NA_IFACTORY_OBJECT_DATA_H__
/**
* SECTION: data-name
@@ -153,4 +153,4 @@ G_BEGIN_DECLS
G_END_DECLS
-#endif /* __NAUTILUS_ACTIONS_API_NA_IFACTORY_OBJECT_DATA_H__ */
+#endif /* __FILE_MANAGER_ACTIONS_API_NA_IFACTORY_OBJECT_DATA_H__ */
diff --git a/src/api/na-ifactory-object.h b/src/api/na-ifactory-object.h
index c86dd3d..6e6f3ca 100644
--- a/src/api/na-ifactory-object.h
+++ b/src/api/na-ifactory-object.h
@@ -27,8 +27,8 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __NAUTILUS_ACTIONS_API_NA_IFACTORY_OBJECT_H__
-#define __NAUTILUS_ACTIONS_API_NA_IFACTORY_OBJECT_H__
+#ifndef __FILE_MANAGER_ACTIONS_API_NA_IFACTORY_OBJECT_H__
+#define __FILE_MANAGER_ACTIONS_API_NA_IFACTORY_OBJECT_H__
/**
* SECTION: ifactory-object
@@ -245,4 +245,4 @@ void na_ifactory_object_set_from_void ( NAIFactoryObject *object, const
G_END_DECLS
-#endif /* __NAUTILUS_ACTIONS_API_NA_IFACTORY_OBJECT_H__ */
+#endif /* __FILE_MANAGER_ACTIONS_API_NA_IFACTORY_OBJECT_H__ */
diff --git a/src/api/na-ifactory-provider-provider.h b/src/api/na-ifactory-provider-provider.h
index d52b16c..2f78f97 100644
--- a/src/api/na-ifactory-provider-provider.h
+++ b/src/api/na-ifactory-provider-provider.h
@@ -27,8 +27,8 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __NAUTILUS_ACTIONS_API_NA_IFACTORY_PROVIDER_PROVIDER_H__
-#define __NAUTILUS_ACTIONS_API_NA_IFACTORY_PROVIDER_PROVIDER_H__
+#ifndef __FILE_MANAGER_ACTIONS_API_NA_IFACTORY_PROVIDER_PROVIDER_H__
+#define __FILE_MANAGER_ACTIONS_API_NA_IFACTORY_PROVIDER_PROVIDER_H__
#include <glib.h>
@@ -38,4 +38,4 @@ typedef struct _NAIFactoryProvider NAIFactoryProvider;
G_END_DECLS
-#endif /* __NAUTILUS_ACTIONS_API_NA_IFACTORY_PROVIDER_PROVIDER_H__ */
+#endif /* __FILE_MANAGER_ACTIONS_API_NA_IFACTORY_PROVIDER_PROVIDER_H__ */
diff --git a/src/api/na-ifactory-provider.h b/src/api/na-ifactory-provider.h
index 1b053a5..84234fb 100644
--- a/src/api/na-ifactory-provider.h
+++ b/src/api/na-ifactory-provider.h
@@ -27,8 +27,8 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __NAUTILUS_ACTIONS_API_NA_IFACTORY_PROVIDER_H__
-#define __NAUTILUS_ACTIONS_API_NA_IFACTORY_PROVIDER_H__
+#ifndef __FILE_MANAGER_ACTIONS_API_NA_IFACTORY_PROVIDER_H__
+#define __FILE_MANAGER_ACTIONS_API_NA_IFACTORY_PROVIDER_H__
/**
* SECTION: ifactory-provider
@@ -289,4 +289,4 @@ guint na_ifactory_provider_write_item( const NAIFactoryProvider *writer, void *w
G_END_DECLS
-#endif /* __NAUTILUS_ACTIONS_API_NA_IFACTORY_PROVIDER_H__ */
+#endif /* __FILE_MANAGER_ACTIONS_API_NA_IFACTORY_PROVIDER_H__ */
diff --git a/src/api/na-iimporter.h b/src/api/na-iimporter.h
index b598fd2..801f288 100644
--- a/src/api/na-iimporter.h
+++ b/src/api/na-iimporter.h
@@ -27,8 +27,8 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __NAUTILUS_ACTIONS_API_NA_IIMPORTER_H__
-#define __NAUTILUS_ACTIONS_API_NA_IIMPORTER_H__
+#ifndef __FILE_MANAGER_ACTIONS_API_NA_IIMPORTER_H__
+#define __FILE_MANAGER_ACTIONS_API_NA_IIMPORTER_H__
/**
* SECTION: iimporter
@@ -411,4 +411,4 @@ guint na_iimporter_import_from_uri( const NAIImporter *importer, NAIImporterImpo
G_END_DECLS
-#endif /* __NAUTILUS_ACTIONS_API_NA_IIMPORTER_H__ */
+#endif /* __FILE_MANAGER_ACTIONS_API_NA_IIMPORTER_H__ */
diff --git a/src/api/na-iio-provider.h b/src/api/na-iio-provider.h
index e8a6516..308b43d 100644
--- a/src/api/na-iio-provider.h
+++ b/src/api/na-iio-provider.h
@@ -27,8 +27,8 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __NAUTILUS_ACTIONS_API_NA_IIO_PROVIDER_H__
-#define __NAUTILUS_ACTIONS_API_NA_IIO_PROVIDER_H__
+#ifndef __FILE_MANAGER_ACTIONS_API_NA_IIO_PROVIDER_H__
+#define __FILE_MANAGER_ACTIONS_API_NA_IIO_PROVIDER_H__
/**
* SECTION: iio-provider
@@ -501,4 +501,4 @@ void na_iio_provider_item_changed( const NAIIOProvider *instance );
G_END_DECLS
-#endif /* __NAUTILUS_ACTIONS_API_NA_IIO_PROVIDER_H__ */
+#endif /* __FILE_MANAGER_ACTIONS_API_NA_IIO_PROVIDER_H__ */
diff --git a/src/api/na-object-action.h b/src/api/na-object-action.h
index 69cbc20..c55cbae 100644
--- a/src/api/na-object-action.h
+++ b/src/api/na-object-action.h
@@ -27,8 +27,8 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __NAUTILUS_ACTIONS_API_NA_OBJECT_ACTION_H__
-#define __NAUTILUS_ACTIONS_API_NA_OBJECT_ACTION_H__
+#ifndef __FILE_MANAGER_ACTIONS_API_NA_OBJECT_ACTION_H__
+#define __FILE_MANAGER_ACTIONS_API_NA_OBJECT_ACTION_H__
/**
* SECTION: object-action
@@ -95,4 +95,4 @@ void na_object_action_set_last_version( NAObjectAction *action );
G_END_DECLS
-#endif /* __NAUTILUS_ACTIONS_API_NA_OBJECT_ACTION_H__ */
+#endif /* __FILE_MANAGER_ACTIONS_API_NA_OBJECT_ACTION_H__ */
diff --git a/src/api/na-object-api.h b/src/api/na-object-api.h
index 025ebe9..72c3391 100644
--- a/src/api/na-object-api.h
+++ b/src/api/na-object-api.h
@@ -27,8 +27,8 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __NAUTILUS_ACTIONS_API_NA_OBJECT_API_H__
-#define __NAUTILUS_ACTIONS_API_NA_OBJECT_API_H__
+#ifndef __FILE_MANAGER_ACTIONS_API_NA_OBJECT_API_H__
+#define __FILE_MANAGER_ACTIONS_API_NA_OBJECT_API_H__
/**
* SECTION: object-api
@@ -218,4 +218,4 @@ G_BEGIN_DECLS
G_END_DECLS
-#endif /* __NAUTILUS_ACTIONS_API_NA_OBJECT_API_H__ */
+#endif /* __FILE_MANAGER_ACTIONS_API_NA_OBJECT_API_H__ */
diff --git a/src/api/na-object-id.h b/src/api/na-object-id.h
index 1a6dad8..a01aed8 100644
--- a/src/api/na-object-id.h
+++ b/src/api/na-object-id.h
@@ -27,8 +27,8 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __NAUTILUS_ACTIONS_API_NA_OBJECT_ID_H__
-#define __NAUTILUS_ACTIONS_API_NA_OBJECT_ID_H__
+#ifndef __FILE_MANAGER_ACTIONS_API_NA_OBJECT_ID_H__
+#define __FILE_MANAGER_ACTIONS_API_NA_OBJECT_ID_H__
/**
* SECTION: object-id
@@ -108,4 +108,4 @@ void na_object_id_set_new_id ( NAObjectId *object, const NAObjectId *new
G_END_DECLS
-#endif /* __NAUTILUS_ACTIONS_API_NA_OBJECT_ID_H__ */
+#endif /* __FILE_MANAGER_ACTIONS_API_NA_OBJECT_ID_H__ */
diff --git a/src/api/na-object-item.h b/src/api/na-object-item.h
index 5766046..5d96e0d 100644
--- a/src/api/na-object-item.h
+++ b/src/api/na-object-item.h
@@ -27,8 +27,8 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __NAUTILUS_ACTIONS_API_NA_OBJECT_ITEM_H__
-#define __NAUTILUS_ACTIONS_API_NA_OBJECT_ITEM_H__
+#ifndef __FILE_MANAGER_ACTIONS_API_NA_OBJECT_ITEM_H__
+#define __FILE_MANAGER_ACTIONS_API_NA_OBJECT_ITEM_H__
/**
* SECTION: object-item
@@ -112,4 +112,4 @@ void na_object_item_set_writability_status( NAObjectItem *item, gboolean
G_END_DECLS
-#endif /* __NAUTILUS_ACTIONS_API_NA_OBJECT_ITEM_H__ */
+#endif /* __FILE_MANAGER_ACTIONS_API_NA_OBJECT_ITEM_H__ */
diff --git a/src/api/na-object-menu.h b/src/api/na-object-menu.h
index 8c2f91f..ce56fa9 100644
--- a/src/api/na-object-menu.h
+++ b/src/api/na-object-menu.h
@@ -27,8 +27,8 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __NAUTILUS_ACTIONS_API_NA_OBJECT_MENU_H__
-#define __NAUTILUS_ACTIONS_API_NA_OBJECT_MENU_H__
+#ifndef __FILE_MANAGER_ACTIONS_API_NA_OBJECT_MENU_H__
+#define __FILE_MANAGER_ACTIONS_API_NA_OBJECT_MENU_H__
/**
* SECTION: object-menu
@@ -73,4 +73,4 @@ NAObjectMenu *na_object_menu_new_with_defaults( void );
G_END_DECLS
-#endif /* __NAUTILUS_ACTIONS_API_NA_OBJECT_MENU_H__ */
+#endif /* __FILE_MANAGER_ACTIONS_API_NA_OBJECT_MENU_H__ */
diff --git a/src/api/na-object-profile.h b/src/api/na-object-profile.h
index 147a2b8..d7b46a2 100644
--- a/src/api/na-object-profile.h
+++ b/src/api/na-object-profile.h
@@ -27,8 +27,8 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __NAUTILUS_ACTIONS_API_NA_OBJECT_PROFILE_H__
-#define __NAUTILUS_ACTIONS_API_NA_OBJECT_PROFILE_H__
+#ifndef __FILE_MANAGER_ACTIONS_API_NA_OBJECT_PROFILE_H__
+#define __FILE_MANAGER_ACTIONS_API_NA_OBJECT_PROFILE_H__
/**
* SECTION: object-profile
@@ -82,4 +82,4 @@ void na_object_profile_convert_v2_to_last( NAObjectProfile *profile
G_END_DECLS
-#endif /* __NAUTILUS_ACTIONS_API_NA_OBJECT_PROFILE_H__ */
+#endif /* __FILE_MANAGER_ACTIONS_API_NA_OBJECT_PROFILE_H__ */
diff --git a/src/api/na-object.h b/src/api/na-object.h
index af307b1..5c0e23d 100644
--- a/src/api/na-object.h
+++ b/src/api/na-object.h
@@ -27,8 +27,8 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __NAUTILUS_ACTIONS_API_NA_OBJECT_H__
-#define __NAUTILUS_ACTIONS_API_NA_OBJECT_H__
+#ifndef __FILE_MANAGER_ACTIONS_API_NA_OBJECT_H__
+#define __FILE_MANAGER_ACTIONS_API_NA_OBJECT_H__
/**
* SECTION: object
@@ -173,4 +173,4 @@ void na_object_object_debug_invalid( const NAObject *object, const gchar *r
G_END_DECLS
-#endif /* __NAUTILUS_ACTIONS_API_NA_OBJECT_H__ */
+#endif /* __FILE_MANAGER_ACTIONS_API_NA_OBJECT_H__ */
diff --git a/src/api/na-timeout.h b/src/api/na-timeout.h
index 32e53c3..58f94cd 100644
--- a/src/api/na-timeout.h
+++ b/src/api/na-timeout.h
@@ -27,8 +27,8 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __NAUTILUS_ACTIONS_API_NA_TIMEOUT_H__
-#define __NAUTILUS_ACTIONS_API_NA_TIMEOUT_H__
+#ifndef __FILE_MANAGER_ACTIONS_API_NA_TIMEOUT_H__
+#define __FILE_MANAGER_ACTIONS_API_NA_TIMEOUT_H__
/**
* SECTION: timeout
@@ -94,4 +94,4 @@ void na_timeout_event( NATimeout *timeout );
G_END_DECLS
-#endif /* __NAUTILUS_ACTIONS_API_NA_TIMEOUT_H__ */
+#endif /* __FILE_MANAGER_ACTIONS_API_NA_TIMEOUT_H__ */
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index ffeb704..2f2a302 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -53,7 +53,7 @@ AM_CPPFLAGS += \
libna_core_la_SOURCES = \
na-about.c \
na-about.h \
- na-boxed.c \
+ fma-boxed.c \
na-core-utils.c \
na-data-boxed.c \
na-data-def.c \
diff --git a/src/core/README b/src/core/README
index dc8e4df..9a5d1c1 100644
--- a/src/core/README
+++ b/src/core/README
@@ -1,4 +1,8 @@
-This is the core dynamic library for Nautilus-Actions.
+src/core
+--------
+This is the core dynamic library for FileManager-Actions.
Come here which is not in the API and should yet be shared between several
N-A components.
+
+P. Wieser, last updated on sept. 2015
diff --git a/src/core/na-boxed.c b/src/core/fma-boxed.c
similarity index 63%
rename from src/core/na-boxed.c
rename to src/core/fma-boxed.c
index d8e891b..ddbc51a 100644
--- a/src/core/na-boxed.c
+++ b/src/core/fma-boxed.c
@@ -34,52 +34,52 @@
#include <stdlib.h>
#include <string.h>
-#include <api/na-boxed.h>
+#include <api/fma-boxed.h>
#include <api/na-data-types.h>
#include <api/na-core-utils.h>
/* private class data
*/
-struct _NABoxedClassPrivate {
+struct _FMABoxedClassPrivate {
void *empty; /* so that gcc -pedantic is happy */
};
-/* BoxedDef:
+/* sBoxedDef:
* This is the structure which fully defines the behavior of this data type.
*/
typedef struct {
guint type;
const gchar *label;
- gboolean ( *are_equal ) ( const NABoxed *, const NABoxed * );
- void ( *copy ) ( NABoxed *, const NABoxed * );
- void ( *free ) ( NABoxed * );
- void ( *from_string ) ( NABoxed *, const gchar * );
- void ( *from_value ) ( NABoxed *, const GValue * );
- void ( *from_void ) ( NABoxed *, const void * );
- gboolean ( *to_bool ) ( const NABoxed * );
- gconstpointer ( *to_pointer ) ( const NABoxed * );
- gchar * ( *to_string ) ( const NABoxed * );
- GSList * ( *to_string_list )( const NABoxed * );
- guint ( *to_uint ) ( const NABoxed * );
- GList * ( *to_uint_list ) ( const NABoxed * );
- void ( *to_value ) ( const NABoxed *, GValue * );
- void * ( *to_void ) ( const NABoxed * );
-}
- BoxedDef;
+ gboolean ( *are_equal ) ( const FMABoxed *, const FMABoxed * );
+ void ( *copy ) ( FMABoxed *, const FMABoxed * );
+ void ( *free ) ( FMABoxed * );
+ void ( *from_string ) ( FMABoxed *, const gchar * );
+ void ( *from_value ) ( FMABoxed *, const GValue * );
+ void ( *from_void ) ( FMABoxed *, const void * );
+ gboolean ( *to_bool ) ( const FMABoxed * );
+ gconstpointer ( *to_pointer ) ( const FMABoxed * );
+ gchar * ( *to_string ) ( const FMABoxed * );
+ GSList * ( *to_string_list )( const FMABoxed * );
+ guint ( *to_uint ) ( const FMABoxed * );
+ GList * ( *to_uint_list ) ( const FMABoxed * );
+ void ( *to_value ) ( const FMABoxed *, GValue * );
+ void * ( *to_void ) ( const FMABoxed * );
+}
+ sBoxedDef;
/* private instance data
*/
-struct _NABoxedPrivate {
- gboolean dispose_has_run;
- const BoxedDef *def;
- gboolean is_set;
+struct _FMABoxedPrivate {
+ gboolean dispose_has_run;
+ const sBoxedDef *def;
+ gboolean is_set;
union {
- gboolean boolean;
- void *pointer;
- gchar *string;
- GSList *string_list;
- guint uint;
- GList *uint_list;
+ gboolean boolean;
+ void *pointer;
+ gchar *string;
+ GSList *string_list;
+ guint uint;
+ GList *uint_list;
} u;
};
@@ -88,90 +88,90 @@ struct _NABoxedPrivate {
static GObjectClass *st_parent_class = NULL;
-static GType register_type( void );
-static void class_init( NABoxedClass *klass );
-static void instance_init( GTypeInstance *instance, gpointer klass );
-static void instance_dispose( GObject *object );
-static void instance_finalize( GObject *object );
-
-static NABoxed *boxed_new( const BoxedDef *def );
-static const BoxedDef *get_boxed_def( guint type );
-static gchar **string_to_array( const gchar *string );
-
-static gboolean bool_are_equal( const NABoxed *a, const NABoxed *b );
-static void bool_copy( NABoxed *dest, const NABoxed *src );
-static void bool_free( NABoxed *boxed );
-static void bool_from_string( NABoxed *boxed, const gchar *string );
-static void bool_from_value( NABoxed *boxed, const GValue *value );
-static void bool_from_void( NABoxed *boxed, const void *value );
-static gchar *bool_to_string( const NABoxed *boxed );
-static gboolean bool_to_bool( const NABoxed *boxed );
-static gconstpointer bool_to_pointer( const NABoxed *boxed );
-static gchar *bool_to_string( const NABoxed *boxed );
-static void bool_to_value( const NABoxed *boxed, GValue *value );
-static void *bool_to_void( const NABoxed *boxed );
-
-static gboolean pointer_are_equal( const NABoxed *a, const NABoxed *b );
-static void pointer_copy( NABoxed *dest, const NABoxed *src );
-static void pointer_free( NABoxed *boxed );
-static void pointer_from_string( NABoxed *boxed, const gchar *string );
-static void pointer_from_value( NABoxed *boxed, const GValue *value );
-static void pointer_from_void( NABoxed *boxed, const void *value );
-static gconstpointer pointer_to_pointer( const NABoxed *boxed );
-static gchar *pointer_to_string( const NABoxed *boxed );
-static void pointer_to_value( const NABoxed *boxed, GValue *value );
-static void *pointer_to_void( const NABoxed *boxed );
-
-static gboolean string_are_equal( const NABoxed *a, const NABoxed *b );
-static void string_copy( NABoxed *dest, const NABoxed *src );
-static void string_free( NABoxed *boxed );
-static void string_from_string( NABoxed *boxed, const gchar *string );
-static void string_from_value( NABoxed *boxed, const GValue *value );
-static void string_from_void( NABoxed *boxed, const void *value );
-static gconstpointer string_to_pointer( const NABoxed *boxed );
-static gchar *string_to_string( const NABoxed *boxed );
-static void string_to_value( const NABoxed *boxed, GValue *value );
-static void *string_to_void( const NABoxed *boxed );
-
-static gboolean string_list_are_equal( const NABoxed *a, const NABoxed *b );
-static void string_list_copy( NABoxed *dest, const NABoxed *src );
-static void string_list_free( NABoxed *boxed );
-static void string_list_from_string( NABoxed *boxed, const gchar *string );
-static void string_list_from_value( NABoxed *boxed, const GValue *value );
-static void string_list_from_void( NABoxed *boxed, const void *value );
-static gconstpointer string_list_to_pointer( const NABoxed *boxed );
-static gchar *string_list_to_string( const NABoxed *boxed );
-static GSList *string_list_to_string_list( const NABoxed *boxed );
-static void string_list_to_value( const NABoxed *boxed, GValue *value );
-static void *string_list_to_void( const NABoxed *boxed );
-
-static gboolean locale_are_equal( const NABoxed *a, const NABoxed *b );
-
-static gboolean uint_are_equal( const NABoxed *a, const NABoxed *b );
-static void uint_copy( NABoxed *dest, const NABoxed *src );
-static void uint_free( NABoxed *boxed );
-static void uint_from_string( NABoxed *boxed, const gchar *string );
-static void uint_from_value( NABoxed *boxed, const GValue *value );
-static void uint_from_void( NABoxed *boxed, const void *value );
-static gconstpointer uint_to_pointer( const NABoxed *boxed );
-static gchar *uint_to_string( const NABoxed *boxed );
-static guint uint_to_uint( const NABoxed *boxed );
-static void uint_to_value( const NABoxed *boxed, GValue *value );
-static void *uint_to_void( const NABoxed *boxed );
-
-static gboolean uint_list_are_equal( const NABoxed *a, const NABoxed *b );
-static void uint_list_copy( NABoxed *dest, const NABoxed *src );
-static void uint_list_free( NABoxed *boxed );
-static void uint_list_from_string( NABoxed *boxed, const gchar *string );
-static void uint_list_from_value( NABoxed *boxed, const GValue *value );
-static void uint_list_from_void( NABoxed *boxed, const void *value );
-static gconstpointer uint_list_to_pointer( const NABoxed *boxed );
-static gchar *uint_list_to_string( const NABoxed *boxed );
-static GList *uint_list_to_uint_list( const NABoxed *boxed );
-static void uint_list_to_value( const NABoxed *boxed, GValue *value );
-static void *uint_list_to_void( const NABoxed *boxed );
-
-static BoxedDef st_boxed_def[] = {
+static GType register_type( void );
+static void class_init( FMABoxedClass *klass );
+static void instance_init( GTypeInstance *instance, gpointer klass );
+static void instance_dispose( GObject *object );
+static void instance_finalize( GObject *object );
+
+static FMABoxed *boxed_new( const sBoxedDef *def );
+static const sBoxedDef *get_boxed_def( guint type );
+static gchar **string_to_array( const gchar *string );
+
+static gboolean bool_are_equal( const FMABoxed *a, const FMABoxed *b );
+static void bool_copy( FMABoxed *dest, const FMABoxed *src );
+static void bool_free( FMABoxed *boxed );
+static void bool_from_string( FMABoxed *boxed, const gchar *string );
+static void bool_from_value( FMABoxed *boxed, const GValue *value );
+static void bool_from_void( FMABoxed *boxed, const void *value );
+static gchar *bool_to_string( const FMABoxed *boxed );
+static gboolean bool_to_bool( const FMABoxed *boxed );
+static gconstpointer bool_to_pointer( const FMABoxed *boxed );
+static gchar *bool_to_string( const FMABoxed *boxed );
+static void bool_to_value( const FMABoxed *boxed, GValue *value );
+static void *bool_to_void( const FMABoxed *boxed );
+
+static gboolean pointer_are_equal( const FMABoxed *a, const FMABoxed *b );
+static void pointer_copy( FMABoxed *dest, const FMABoxed *src );
+static void pointer_free( FMABoxed *boxed );
+static void pointer_from_string( FMABoxed *boxed, const gchar *string );
+static void pointer_from_value( FMABoxed *boxed, const GValue *value );
+static void pointer_from_void( FMABoxed *boxed, const void *value );
+static gconstpointer pointer_to_pointer( const FMABoxed *boxed );
+static gchar *pointer_to_string( const FMABoxed *boxed );
+static void pointer_to_value( const FMABoxed *boxed, GValue *value );
+static void *pointer_to_void( const FMABoxed *boxed );
+
+static gboolean string_are_equal( const FMABoxed *a, const FMABoxed *b );
+static void string_copy( FMABoxed *dest, const FMABoxed *src );
+static void string_free( FMABoxed *boxed );
+static void string_from_string( FMABoxed *boxed, const gchar *string );
+static void string_from_value( FMABoxed *boxed, const GValue *value );
+static void string_from_void( FMABoxed *boxed, const void *value );
+static gconstpointer string_to_pointer( const FMABoxed *boxed );
+static gchar *string_to_string( const FMABoxed *boxed );
+static void string_to_value( const FMABoxed *boxed, GValue *value );
+static void *string_to_void( const FMABoxed *boxed );
+
+static gboolean string_list_are_equal( const FMABoxed *a, const FMABoxed *b );
+static void string_list_copy( FMABoxed *dest, const FMABoxed *src );
+static void string_list_free( FMABoxed *boxed );
+static void string_list_from_string( FMABoxed *boxed, const gchar *string );
+static void string_list_from_value( FMABoxed *boxed, const GValue *value );
+static void string_list_from_void( FMABoxed *boxed, const void *value );
+static gconstpointer string_list_to_pointer( const FMABoxed *boxed );
+static gchar *string_list_to_string( const FMABoxed *boxed );
+static GSList *string_list_to_string_list( const FMABoxed *boxed );
+static void string_list_to_value( const FMABoxed *boxed, GValue *value );
+static void *string_list_to_void( const FMABoxed *boxed );
+
+static gboolean locale_are_equal( const FMABoxed *a, const FMABoxed *b );
+
+static gboolean uint_are_equal( const FMABoxed *a, const FMABoxed *b );
+static void uint_copy( FMABoxed *dest, const FMABoxed *src );
+static void uint_free( FMABoxed *boxed );
+static void uint_from_string( FMABoxed *boxed, const gchar *string );
+static void uint_from_value( FMABoxed *boxed, const GValue *value );
+static void uint_from_void( FMABoxed *boxed, const void *value );
+static gconstpointer uint_to_pointer( const FMABoxed *boxed );
+static gchar *uint_to_string( const FMABoxed *boxed );
+static guint uint_to_uint( const FMABoxed *boxed );
+static void uint_to_value( const FMABoxed *boxed, GValue *value );
+static void *uint_to_void( const FMABoxed *boxed );
+
+static gboolean uint_list_are_equal( const FMABoxed *a, const FMABoxed *b );
+static void uint_list_copy( FMABoxed *dest, const FMABoxed *src );
+static void uint_list_free( FMABoxed *boxed );
+static void uint_list_from_string( FMABoxed *boxed, const gchar *string );
+static void uint_list_from_value( FMABoxed *boxed, const GValue *value );
+static void uint_list_from_void( FMABoxed *boxed, const void *value );
+static gconstpointer uint_list_to_pointer( const FMABoxed *boxed );
+static gchar *uint_list_to_string( const FMABoxed *boxed );
+static GList *uint_list_to_uint_list( const FMABoxed *boxed );
+static void uint_list_to_value( const FMABoxed *boxed, GValue *value );
+static void *uint_list_to_void( const FMABoxed *boxed );
+
+static sBoxedDef st_boxed_def[] = {
{ NA_DATA_TYPE_BOOLEAN,
"boolean",
bool_are_equal,
@@ -295,7 +295,7 @@ static BoxedDef st_boxed_def[] = {
};
GType
-na_boxed_get_type( void )
+fma_boxed_get_type( void )
{
static GType item_type = 0;
@@ -309,32 +309,32 @@ na_boxed_get_type( void )
static GType
register_type( void )
{
- static const gchar *thisfn = "na_boxed_register_type";
+ static const gchar *thisfn = "fma_boxed_register_type";
GType type;
static GTypeInfo info = {
- sizeof( NABoxedClass ),
+ sizeof( FMABoxedClass ),
NULL,
NULL,
( GClassInitFunc ) class_init,
NULL,
NULL,
- sizeof( NABoxed ),
+ sizeof( FMABoxed ),
0,
( GInstanceInitFunc ) instance_init
};
g_debug( "%s", thisfn );
- type = g_type_register_static( G_TYPE_OBJECT, "NABoxed", &info, 0 );
+ type = g_type_register_static( G_TYPE_OBJECT, "FMABoxed", &info, 0 );
return( type );
}
static void
-class_init( NABoxedClass *klass )
+class_init( FMABoxedClass *klass )
{
- static const gchar *thisfn = "na_boxed_class_init";
+ static const gchar *thisfn = "fma_boxed_class_init";
GObjectClass *object_class;
g_debug( "%s: klass=%p", thisfn, ( void * ) klass );
@@ -345,23 +345,23 @@ class_init( NABoxedClass *klass )
object_class->dispose = instance_dispose;
object_class->finalize = instance_finalize;
- klass->private = g_new0( NABoxedClassPrivate, 1 );
+ klass->private = g_new0( FMABoxedClassPrivate, 1 );
}
static void
instance_init( GTypeInstance *instance, gpointer klass )
{
- static const gchar *thisfn = "na_boxed_instance_init";
- NABoxed *self;
+ static const gchar *thisfn = "fma_boxed_instance_init";
+ FMABoxed *self;
- g_return_if_fail( NA_IS_BOXED( instance ));
+ g_return_if_fail( FMA_IS_BOXED( instance ));
DEBUG( "%s: instance=%p (%s), klass=%p",
thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ), ( void * ) klass );
- self = NA_BOXED( instance );
+ self = FMA_BOXED( instance );
- self->private = g_new0( NABoxedPrivate, 1 );
+ self->private = g_new0( FMABoxedPrivate, 1 );
self->private->dispose_has_run = FALSE;
self->private->def = NULL;
@@ -371,11 +371,11 @@ instance_init( GTypeInstance *instance, gpointer klass )
static void
instance_dispose( GObject *object )
{
- NABoxed *self;
+ FMABoxed *self;
- g_return_if_fail( NA_IS_BOXED( object ));
+ g_return_if_fail( FMA_IS_BOXED( object ));
- self = NA_BOXED( object );
+ self = FMA_BOXED( object );
if( !self->private->dispose_has_run ){
@@ -391,14 +391,14 @@ instance_dispose( GObject *object )
static void
instance_finalize( GObject *object )
{
- static const gchar *thisfn = "na_boxed_instance_finalize";
- NABoxed *self;
+ static const gchar *thisfn = "fma_boxed_instance_finalize";
+ FMABoxed *self;
- g_return_if_fail( NA_IS_BOXED( object ));
+ g_return_if_fail( FMA_IS_BOXED( object ));
DEBUG( "%s: object=%p (%s)", thisfn, ( void * ) object, G_OBJECT_TYPE_NAME( object ));
- self = NA_BOXED( object );
+ self = FMA_BOXED( object );
if( self->private->def ){
if( self->private->def->free ){
@@ -414,26 +414,26 @@ instance_finalize( GObject *object )
}
}
-static NABoxed *
-boxed_new( const BoxedDef *def )
+static FMABoxed *
+boxed_new( const sBoxedDef *def )
{
- NABoxed *boxed;
+ FMABoxed *boxed;
- boxed = g_object_new( NA_TYPE_BOXED, NULL );
+ boxed = g_object_new( FMA_TYPE_BOXED, NULL );
boxed->private->def = def;
return( boxed );
}
-static const BoxedDef *
+static const sBoxedDef *
get_boxed_def( guint type )
{
- static const gchar *thisfn = "na_boxed_get_boxed_def";
- BoxedDef *def;
+ static const gchar *thisfn = "fma_boxed_get_boxed_def";
+ sBoxedDef *def;
for( def = st_boxed_def ; def->type ; ++def ){
if( def->type == type ){
- return(( const BoxedDef * ) def );
+ return(( const sBoxedDef * ) def );
}
}
@@ -483,8 +483,8 @@ string_to_array( const gchar *string )
}
/**
- * na_boxed_set_type:
- * @boxed: this #NABoxed object.
+ * fma_boxed_set_type:
+ * @boxed: this #FMABoxed object.
* @type: the required type as defined in na-data-types.h
*
* Set the type of the just-allocated @boxed object.
@@ -492,9 +492,9 @@ string_to_array( const gchar *string )
* Since: 3.1
*/
void
-na_boxed_set_type( NABoxed *boxed, guint type )
+fma_boxed_set_type( FMABoxed *boxed, guint type )
{
- g_return_if_fail( NA_IS_BOXED( boxed ));
+ g_return_if_fail( FMA_IS_BOXED( boxed ));
g_return_if_fail( boxed->private->dispose_has_run == FALSE );
g_return_if_fail( boxed->private->def == NULL );
@@ -502,22 +502,22 @@ na_boxed_set_type( NABoxed *boxed, guint type )
}
/**
- * na_boxed_are_equal:
- * @a: the first #NABoxed object.
- * @b: the second #NABoxed object.
+ * fma_boxed_are_equal:
+ * @a: the first #FMABoxed object.
+ * @b: the second #FMABoxed object.
*
* Returns: %TRUE if @a and @b are equal, %FALSE else.
*
* Since: 3.1
*/
gboolean
-na_boxed_are_equal( const NABoxed *a, const NABoxed *b )
+fma_boxed_are_equal( const FMABoxed *a, const FMABoxed *b )
{
gboolean are_equal;
- g_return_val_if_fail( NA_IS_BOXED( a ), FALSE );
+ g_return_val_if_fail( FMA_IS_BOXED( a ), FALSE );
g_return_val_if_fail( a->private->dispose_has_run == FALSE, FALSE );
- g_return_val_if_fail( NA_IS_BOXED( b ), FALSE );
+ g_return_val_if_fail( FMA_IS_BOXED( b ), FALSE );
g_return_val_if_fail( b->private->dispose_has_run == FALSE, FALSE );
g_return_val_if_fail( a->private->def, FALSE );
g_return_val_if_fail( a->private->def == b->private->def, FALSE );
@@ -536,20 +536,20 @@ na_boxed_are_equal( const NABoxed *a, const NABoxed *b )
}
/**
- * na_boxed_copy:
- * @boxed: the source #NABoxed box.
+ * fma_boxed_copy:
+ * @boxed: the source #FMABoxed box.
*
- * Returns: a copy of @boxed, as a newly allocated #NABoxed which should
+ * Returns: a copy of @boxed, as a newly allocated #FMABoxed which should
* be g_object_unref() by the caller.
*
* Since: 3.1
*/
-NABoxed *
-na_boxed_copy( const NABoxed *boxed )
+FMABoxed *
+fma_boxed_copy( const FMABoxed *boxed )
{
- NABoxed *dest;
+ FMABoxed *dest;
- g_return_val_if_fail( NA_IS_BOXED( boxed ), NULL );
+ g_return_val_if_fail( FMA_IS_BOXED( boxed ), NULL );
g_return_val_if_fail( boxed->private->dispose_has_run == FALSE, NULL );
g_return_val_if_fail( boxed->private->def, NULL );
g_return_val_if_fail( boxed->private->def->copy, NULL );
@@ -564,20 +564,20 @@ na_boxed_copy( const NABoxed *boxed )
}
/**
- * na_boxed_dump:
- * @boxed: the #NABoxed box to be dumped.
+ * fma_boxed_dump:
+ * @boxed: the #FMABoxed box to be dumped.
*
* Dumps the @boxed box.
*
* Since: 3.1
*/
void
-na_boxed_dump( const NABoxed *boxed )
+fma_boxed_dump( const FMABoxed *boxed )
{
- static const gchar *thisfn = "na_boxed_dump";
+ static const gchar *thisfn = "fma_boxed_dump";
gchar *str;
- g_return_if_fail( NA_IS_BOXED( boxed ));
+ g_return_if_fail( FMA_IS_BOXED( boxed ));
g_return_if_fail( boxed->private->dispose_has_run == FALSE );
g_return_if_fail( boxed->private->def );
g_return_if_fail( boxed->private->def->to_string );
@@ -590,26 +590,26 @@ na_boxed_dump( const NABoxed *boxed )
}
/**
- * na_boxed_new_from_string:
- * @type: the type of the #NABoxed to be allocated.
- * @string: the initial value of the #NABoxed as a string.
+ * fma_boxed_new_from_string:
+ * @type: the type of the #FMABoxed to be allocated.
+ * @string: the initial value of the #FMABoxed as a string.
*
- * Allocates a new #NABoxed of the specified @type, and initializes it
+ * Allocates a new #FMABoxed of the specified @type, and initializes it
* with @string.
*
* If the type is a list, then the last separator is automatically stripped.
*
- * Returns: a newly allocated #NABoxed, which should be g_object_unref()
+ * Returns: a newly allocated #FMABoxed, which should be g_object_unref()
* by the caller, or %NULL if the type is unknowned, or does not provide
* the 'from_string' function.
*
* Since: 3.1
*/
-NABoxed *
-na_boxed_new_from_string( guint type, const gchar *string )
+FMABoxed *
+fma_boxed_new_from_string( guint type, const gchar *string )
{
- const BoxedDef *def;
- NABoxed *boxed;
+ const sBoxedDef *def;
+ FMABoxed *boxed;
def = get_boxed_def( type );
@@ -624,8 +624,8 @@ na_boxed_new_from_string( guint type, const gchar *string )
}
/**
- * na_boxed_get_boolean:
- * @boxed: the #NABoxed structure.
+ * fma_boxed_get_boolean:
+ * @boxed: the #FMABoxed structure.
*
* Returns: the boolean value if @boxed is of %NA_DATA_TYPE_BOOLEAN type,
* %FALSE else.
@@ -633,11 +633,11 @@ na_boxed_new_from_string( guint type, const gchar *string )
* Since: 3.1
*/
gboolean
-na_boxed_get_boolean( const NABoxed *boxed )
+fma_boxed_get_boolean( const FMABoxed *boxed )
{
gboolean value;
- g_return_val_if_fail( NA_IS_BOXED( boxed ), FALSE );
+ g_return_val_if_fail( FMA_IS_BOXED( boxed ), FALSE );
g_return_val_if_fail( boxed->private->dispose_has_run == FALSE, FALSE );
g_return_val_if_fail( boxed->private->def, FALSE );
g_return_val_if_fail( boxed->private->def->type == NA_DATA_TYPE_BOOLEAN, FALSE );
@@ -649,8 +649,8 @@ na_boxed_get_boolean( const NABoxed *boxed )
}
/**
- * na_boxed_get_pointer:
- * @boxed: the #NABoxed structure.
+ * fma_boxed_get_pointer:
+ * @boxed: the #FMABoxed structure.
*
* Returns: a const pointer to the data if @boxed is of %NA_DATA_TYPE_POINTER
* type, %NULL else.
@@ -658,11 +658,11 @@ na_boxed_get_boolean( const NABoxed *boxed )
* Since: 3.1
*/
gconstpointer
-na_boxed_get_pointer( const NABoxed *boxed )
+fma_boxed_get_pointer( const FMABoxed *boxed )
{
gconstpointer value;
- g_return_val_if_fail( NA_IS_BOXED( boxed ), NULL );
+ g_return_val_if_fail( FMA_IS_BOXED( boxed ), NULL );
g_return_val_if_fail( boxed->private->dispose_has_run == FALSE, NULL );
g_return_val_if_fail( boxed->private->def, NULL );
g_return_val_if_fail( boxed->private->def->to_pointer, NULL );
@@ -673,8 +673,8 @@ na_boxed_get_pointer( const NABoxed *boxed )
}
/**
- * na_boxed_get_string:
- * @boxed: the #NABoxed structure.
+ * fma_boxed_get_string:
+ * @boxed: the #FMABoxed structure.
*
* Returns: a newly allocated string if @boxed is of %NA_DATA_TYPE_STRING
* type, which should be g_free() by the caller, %NULL else.
@@ -682,11 +682,11 @@ na_boxed_get_pointer( const NABoxed *boxed )
* Since: 3.1
*/
gchar *
-na_boxed_get_string( const NABoxed *boxed )
+fma_boxed_get_string( const FMABoxed *boxed )
{
gchar *value;
- g_return_val_if_fail( NA_IS_BOXED( boxed ), NULL );
+ g_return_val_if_fail( FMA_IS_BOXED( boxed ), NULL );
g_return_val_if_fail( boxed->private->dispose_has_run == FALSE, NULL );
g_return_val_if_fail( boxed->private->def, NULL );
g_return_val_if_fail( boxed->private->def->to_string, NULL );
@@ -697,8 +697,8 @@ na_boxed_get_string( const NABoxed *boxed )
}
/**
- * na_boxed_get_string_list:
- * @boxed: the #NABoxed structure.
+ * fma_boxed_get_string_list:
+ * @boxed: the #FMABoxed structure.
*
* Returns: a newly allocated string list if @boxed is of %NA_DATA_TYPE_STRING_LIST
* type, which should be na_core_utils_slist_free() by the caller, %NULL else.
@@ -706,11 +706,11 @@ na_boxed_get_string( const NABoxed *boxed )
* Since: 3.1
*/
GSList *
-na_boxed_get_string_list( const NABoxed *boxed )
+fma_boxed_get_string_list( const FMABoxed *boxed )
{
GSList *value;
- g_return_val_if_fail( NA_IS_BOXED( boxed ), NULL );
+ g_return_val_if_fail( FMA_IS_BOXED( boxed ), NULL );
g_return_val_if_fail( boxed->private->dispose_has_run == FALSE, NULL );
g_return_val_if_fail( boxed->private->def, NULL );
g_return_val_if_fail( boxed->private->def->type == NA_DATA_TYPE_STRING_LIST, NULL );
@@ -722,8 +722,8 @@ na_boxed_get_string_list( const NABoxed *boxed )
}
/**
- * na_boxed_get_uint:
- * @boxed: the #NABoxed structure.
+ * fma_boxed_get_uint:
+ * @boxed: the #FMABoxed structure.
*
* Returns: an unsigned integer if @boxed is of %NA_DATA_TYPE_UINT type,
* zero else.
@@ -731,11 +731,11 @@ na_boxed_get_string_list( const NABoxed *boxed )
* Since: 3.1
*/
guint
-na_boxed_get_uint( const NABoxed *boxed )
+fma_boxed_get_uint( const FMABoxed *boxed )
{
guint value;
- g_return_val_if_fail( NA_IS_BOXED( boxed ), 0 );
+ g_return_val_if_fail( FMA_IS_BOXED( boxed ), 0 );
g_return_val_if_fail( boxed->private->dispose_has_run == FALSE, 0 );
g_return_val_if_fail( boxed->private->def, 0 );
g_return_val_if_fail( boxed->private->def->type == NA_DATA_TYPE_UINT, 0 );
@@ -747,8 +747,8 @@ na_boxed_get_uint( const NABoxed *boxed )
}
/**
- * na_boxed_get_uint_list:
- * @boxed: the #NABoxed structure.
+ * fma_boxed_get_uint_list:
+ * @boxed: the #FMABoxed structure.
*
* Returns: a newly allocated list if @boxed is of %NA_DATA_TYPE_UINT_LIST
* type, which should be g_list_free() by the caller, %FALSE else.
@@ -756,11 +756,11 @@ na_boxed_get_uint( const NABoxed *boxed )
* Since: 3.1
*/
GList *
-na_boxed_get_uint_list( const NABoxed *boxed )
+fma_boxed_get_uint_list( const FMABoxed *boxed )
{
GList *value;
- g_return_val_if_fail( NA_IS_BOXED( boxed ), NULL );
+ g_return_val_if_fail( FMA_IS_BOXED( boxed ), NULL );
g_return_val_if_fail( boxed->private->dispose_has_run == FALSE, NULL );
g_return_val_if_fail( boxed->private->def, NULL );
g_return_val_if_fail( boxed->private->def->type == NA_DATA_TYPE_UINT_LIST, NULL );
@@ -772,8 +772,8 @@ na_boxed_get_uint_list( const NABoxed *boxed )
}
/**
- * na_boxed_get_as_value:
- * @boxed: the #NABoxed whose value is to be got.
+ * fma_boxed_get_as_value:
+ * @boxed: the #FMABoxed whose value is to be got.
* @value: the #GValue which holds the string to be set.
*
* Setup @value with the content of the @boxed.
@@ -781,9 +781,9 @@ na_boxed_get_uint_list( const NABoxed *boxed )
* Since: 3.1
*/
void
-na_boxed_get_as_value( const NABoxed *boxed, GValue *value )
+fma_boxed_get_as_value( const FMABoxed *boxed, GValue *value )
{
- g_return_if_fail( NA_IS_BOXED( boxed ));
+ g_return_if_fail( FMA_IS_BOXED( boxed ));
g_return_if_fail( boxed->private->dispose_has_run == FALSE );
g_return_if_fail( boxed->private->def );
g_return_if_fail( boxed->private->def->to_value );
@@ -792,8 +792,8 @@ na_boxed_get_as_value( const NABoxed *boxed, GValue *value )
}
/**
- * na_boxed_get_as_void:
- * @boxed: the #NABoxed whose value is to be got.
+ * fma_boxed_get_as_void:
+ * @boxed: the #FMABoxed whose value is to be got.
*
* Returns: the content of the @boxed.
*
@@ -805,9 +805,9 @@ na_boxed_get_as_value( const NABoxed *boxed, GValue *value )
* Since: 3.1
*/
void *
-na_boxed_get_as_void( const NABoxed *boxed )
+fma_boxed_get_as_void( const FMABoxed *boxed )
{
- g_return_val_if_fail( NA_IS_BOXED( boxed ), NULL );
+ g_return_val_if_fail( FMA_IS_BOXED( boxed ), NULL );
g_return_val_if_fail( boxed->private->dispose_has_run == FALSE, NULL );
g_return_val_if_fail( boxed->private->def, NULL );
g_return_val_if_fail( boxed->private->def->to_void, NULL );
@@ -816,20 +816,20 @@ na_boxed_get_as_void( const NABoxed *boxed )
}
/**
- * na_boxed_set_from_boxed:
- * @boxed: the #NABoxed whose value is to be set.
- * @value: the source #NABoxed.
+ * fma_boxed_set_from_boxed:
+ * @boxed: the #FMABoxed whose value is to be set.
+ * @value: the source #FMABoxed.
*
* Copy value from @value to @boxed.
*
* Since: 3.1
*/
void
-na_boxed_set_from_boxed( NABoxed *boxed, const NABoxed *value )
+fma_boxed_set_from_boxed( FMABoxed *boxed, const FMABoxed *value )
{
- g_return_if_fail( NA_IS_BOXED( boxed ));
+ g_return_if_fail( FMA_IS_BOXED( boxed ));
g_return_if_fail( boxed->private->dispose_has_run == FALSE );
- g_return_if_fail( NA_IS_BOXED( value ));
+ g_return_if_fail( FMA_IS_BOXED( value ));
g_return_if_fail( value->private->dispose_has_run == FALSE );
g_return_if_fail( boxed->private->def );
g_return_if_fail( boxed->private->def == value->private->def );
@@ -842,8 +842,8 @@ na_boxed_set_from_boxed( NABoxed *boxed, const NABoxed *value )
}
/**
- * na_boxed_set_from_string:
- * @boxed: the #NABoxed whose value is to be set.
+ * fma_boxed_set_from_string:
+ * @boxed: the #FMABoxed whose value is to be set.
* @value: the string to be set.
*
* Evaluates the @value and set it to the @boxed.
@@ -851,9 +851,9 @@ na_boxed_set_from_boxed( NABoxed *boxed, const NABoxed *value )
* Since: 3.1
*/
void
-na_boxed_set_from_string( NABoxed *boxed, const gchar *value )
+fma_boxed_set_from_string( FMABoxed *boxed, const gchar *value )
{
- g_return_if_fail( NA_IS_BOXED( boxed ));
+ g_return_if_fail( FMA_IS_BOXED( boxed ));
g_return_if_fail( boxed->private->dispose_has_run == FALSE );
g_return_if_fail( boxed->private->def );
g_return_if_fail( boxed->private->def->free );
@@ -865,8 +865,8 @@ na_boxed_set_from_string( NABoxed *boxed, const gchar *value )
}
/**
- * na_boxed_set_from_value:
- * @boxed: the #NABoxed whose value is to be set.
+ * fma_boxed_set_from_value:
+ * @boxed: the #FMABoxed whose value is to be set.
* @value: the value whose content is to be got.
*
* Evaluates the @value and set it to the @boxed.
@@ -874,9 +874,9 @@ na_boxed_set_from_string( NABoxed *boxed, const gchar *value )
* Since: 3.1
*/
void
-na_boxed_set_from_value( NABoxed *boxed, const GValue *value )
+fma_boxed_set_from_value( FMABoxed *boxed, const GValue *value )
{
- g_return_if_fail( NA_IS_BOXED( boxed ));
+ g_return_if_fail( FMA_IS_BOXED( boxed ));
g_return_if_fail( boxed->private->dispose_has_run == FALSE );
g_return_if_fail( boxed->private->def );
g_return_if_fail( boxed->private->def->free );
@@ -888,8 +888,8 @@ na_boxed_set_from_value( NABoxed *boxed, const GValue *value )
}
/**
- * na_boxed_set_from_void:
- * @boxed: the #NABoxed whose value is to be set.
+ * fma_boxed_set_from_void:
+ * @boxed: the #FMABoxed whose value is to be set.
* @value: the value whose content is to be got.
*
* Evaluates the @value and set it to the @boxed.
@@ -897,9 +897,9 @@ na_boxed_set_from_value( NABoxed *boxed, const GValue *value )
* Since: 3.1
*/
void
-na_boxed_set_from_void( NABoxed *boxed, const void *value )
+fma_boxed_set_from_void( FMABoxed *boxed, const void *value )
{
- g_return_if_fail( NA_IS_BOXED( boxed ));
+ g_return_if_fail( FMA_IS_BOXED( boxed ));
g_return_if_fail( boxed->private->dispose_has_run == FALSE );
g_return_if_fail( boxed->private->def );
g_return_if_fail( boxed->private->def->free );
@@ -911,74 +911,74 @@ na_boxed_set_from_void( NABoxed *boxed, const void *value )
}
static gboolean
-bool_are_equal( const NABoxed *a, const NABoxed *b )
+bool_are_equal( const FMABoxed *a, const FMABoxed *b )
{
return( a->private->u.boolean == b->private->u.boolean );
}
static void
-bool_copy( NABoxed *dest, const NABoxed *src )
+bool_copy( FMABoxed *dest, const FMABoxed *src )
{
dest->private->u.boolean = src->private->u.boolean;
}
static void
-bool_free( NABoxed *boxed )
+bool_free( FMABoxed *boxed )
{
boxed->private->u.boolean = FALSE;
boxed->private->is_set = FALSE;
}
static void
-bool_from_string( NABoxed *boxed, const gchar *string )
+bool_from_string( FMABoxed *boxed, const gchar *string )
{
boxed->private->u.boolean = na_core_utils_boolean_from_string( string );
}
static void
-bool_from_value( NABoxed *boxed, const GValue *value )
+bool_from_value( FMABoxed *boxed, const GValue *value )
{
boxed->private->u.boolean = g_value_get_boolean( value );
}
static void
-bool_from_void( NABoxed *boxed, const void *value )
+bool_from_void( FMABoxed *boxed, const void *value )
{
boxed->private->u.boolean = GPOINTER_TO_UINT( value );
}
static gboolean
-bool_to_bool( const NABoxed *boxed )
+bool_to_bool( const FMABoxed *boxed )
{
return( boxed->private->u.boolean );
}
static gconstpointer
-bool_to_pointer( const NABoxed *boxed )
+bool_to_pointer( const FMABoxed *boxed )
{
return(( gconstpointer ) GUINT_TO_POINTER( boxed->private->u.boolean ));
}
static gchar *
-bool_to_string( const NABoxed *boxed )
+bool_to_string( const FMABoxed *boxed )
{
return( g_strdup_printf( "%s", boxed->private->u.boolean ? "true":"false" ));
}
static void
-bool_to_value( const NABoxed *boxed, GValue *value )
+bool_to_value( const FMABoxed *boxed, GValue *value )
{
g_value_set_boolean( value, boxed->private->u.boolean );
}
static void *
-bool_to_void( const NABoxed *boxed )
+bool_to_void( const FMABoxed *boxed )
{
return( GUINT_TO_POINTER( boxed->private->u.boolean ));
}
static gboolean
-pointer_are_equal( const NABoxed *a, const NABoxed *b )
+pointer_are_equal( const FMABoxed *a, const FMABoxed *b )
{
return( a->private->u.pointer == b->private->u.pointer );
}
@@ -987,62 +987,62 @@ pointer_are_equal( const NABoxed *a, const NABoxed *b )
* note that copying a pointer is not safe
*/
static void
-pointer_copy( NABoxed *dest, const NABoxed *src )
+pointer_copy( FMABoxed *dest, const FMABoxed *src )
{
dest->private->u.pointer = src->private->u.pointer;
}
static void
-pointer_free( NABoxed *boxed )
+pointer_free( FMABoxed *boxed )
{
boxed->private->u.pointer = NULL;
boxed->private->is_set = FALSE;
}
static void
-pointer_from_string( NABoxed *boxed, const gchar *pointer )
+pointer_from_string( FMABoxed *boxed, const gchar *pointer )
{
- g_warning( "na_boxed_pointer_from_string: unrelevant function call" );
+ g_warning( "fma_boxed_pointer_from_string: unrelevant function call" );
}
static void
-pointer_from_value( NABoxed *boxed, const GValue *value )
+pointer_from_value( FMABoxed *boxed, const GValue *value )
{
boxed->private->u.pointer = g_value_get_pointer( value );
}
static void
-pointer_from_void( NABoxed *boxed, const void *value )
+pointer_from_void( FMABoxed *boxed, const void *value )
{
boxed->private->u.pointer = ( void * ) value;
}
static gconstpointer
-pointer_to_pointer( const NABoxed *boxed )
+pointer_to_pointer( const FMABoxed *boxed )
{
return( boxed->private->u.pointer );
}
static gchar *
-pointer_to_string( const NABoxed *boxed )
+pointer_to_string( const FMABoxed *boxed )
{
return( g_strdup_printf( "%p", boxed->private->u.pointer ));
}
static void
-pointer_to_value( const NABoxed *boxed, GValue *value )
+pointer_to_value( const FMABoxed *boxed, GValue *value )
{
g_value_set_pointer( value, boxed->private->u.pointer );
}
static void *
-pointer_to_void( const NABoxed *boxed )
+pointer_to_void( const FMABoxed *boxed )
{
return( boxed->private->u.pointer );
}
static gboolean
-string_are_equal( const NABoxed *a, const NABoxed *b )
+string_are_equal( const FMABoxed *a, const FMABoxed *b )
{
if( a->private->u.string && b->private->u.string ){
return( strcmp( a->private->u.string, b->private->u.string ) == 0 );
@@ -1054,13 +1054,13 @@ string_are_equal( const NABoxed *a, const NABoxed *b )
}
static void
-string_copy( NABoxed *dest, const NABoxed *src )
+string_copy( FMABoxed *dest, const FMABoxed *src )
{
dest->private->u.string = g_strdup( src->private->u.string );
}
static void
-string_free( NABoxed *boxed )
+string_free( FMABoxed *boxed )
{
g_free( boxed->private->u.string );
boxed->private->u.string = NULL;
@@ -1068,13 +1068,13 @@ string_free( NABoxed *boxed )
}
static void
-string_from_string( NABoxed *boxed, const gchar *string )
+string_from_string( FMABoxed *boxed, const gchar *string )
{
boxed->private->u.string = g_strdup( string ? string : "" );
}
static void
-string_from_value( NABoxed *boxed, const GValue *value )
+string_from_value( FMABoxed *boxed, const GValue *value )
{
if( g_value_get_string( value )){
boxed->private->u.string = g_value_dup_string( value );
@@ -1084,25 +1084,25 @@ string_from_value( NABoxed *boxed, const GValue *value )
}
static void
-string_from_void( NABoxed *boxed, const void *value )
+string_from_void( FMABoxed *boxed, const void *value )
{
boxed->private->u.string = g_strdup( value ? ( const gchar * ) value : "" );
}
static gconstpointer
-string_to_pointer( const NABoxed *boxed )
+string_to_pointer( const FMABoxed *boxed )
{
return(( gconstpointer ) boxed->private->u.string );
}
static gchar *
-string_to_string( const NABoxed *boxed )
+string_to_string( const FMABoxed *boxed )
{
return( g_strdup( boxed->private->u.string ));
}
static void
-string_to_value( const NABoxed *boxed, GValue *value )
+string_to_value( const FMABoxed *boxed, GValue *value )
{
gchar *str;
@@ -1112,7 +1112,7 @@ string_to_value( const NABoxed *boxed, GValue *value )
}
static void *
-string_to_void( const NABoxed *boxed )
+string_to_void( const FMABoxed *boxed )
{
return(( void * ) string_to_string( boxed ));
}
@@ -1121,7 +1121,7 @@ string_to_void( const NABoxed *boxed )
* same order
*/
static gboolean
-string_list_are_equal( const NABoxed *a, const NABoxed *b )
+string_list_are_equal( const FMABoxed *a, const FMABoxed *b )
{
GSList *ia, *ib;
gboolean diff = FALSE;
@@ -1141,7 +1141,7 @@ string_list_are_equal( const NABoxed *a, const NABoxed *b )
}
static void
-string_list_copy( NABoxed *dest, const NABoxed *src )
+string_list_copy( FMABoxed *dest, const FMABoxed *src )
{
if( dest->private->is_set ){
string_list_free( dest );
@@ -1151,7 +1151,7 @@ string_list_copy( NABoxed *dest, const NABoxed *src )
}
static void
-string_list_free( NABoxed *boxed )
+string_list_free( FMABoxed *boxed )
{
na_core_utils_slist_free( boxed->private->u.string_list );
boxed->private->u.string_list = NULL;
@@ -1164,7 +1164,7 @@ string_list_free( NABoxed *boxed )
* - as a comma-separated list of string, between two square brackets (à la GConf)
*/
static void
-string_list_from_string( NABoxed *boxed, const gchar *string )
+string_list_from_string( FMABoxed *boxed, const gchar *string )
{
gchar **array;
gchar **i;
@@ -1186,13 +1186,13 @@ string_list_from_string( NABoxed *boxed, const gchar *string )
}
static void
-string_list_from_value( NABoxed *boxed, const GValue *value )
+string_list_from_value( FMABoxed *boxed, const GValue *value )
{
string_list_from_void( boxed, ( const void * ) g_value_get_pointer( value ));
}
static void
-string_list_from_void( NABoxed *boxed, const void *value )
+string_list_from_void( FMABoxed *boxed, const void *value )
{
GSList *value_slist;
GSList *it;
@@ -1207,13 +1207,13 @@ string_list_from_void( NABoxed *boxed, const void *value )
}
static gconstpointer
-string_list_to_pointer( const NABoxed *boxed )
+string_list_to_pointer( const FMABoxed *boxed )
{
return(( gconstpointer ) boxed->private->u.string_list );
}
static gchar *
-string_list_to_string( const NABoxed *boxed )
+string_list_to_string( const FMABoxed *boxed )
{
GSList *is;
GString *str = g_string_new( "" );
@@ -1232,19 +1232,19 @@ string_list_to_string( const NABoxed *boxed )
}
static GSList *
-string_list_to_string_list( const NABoxed *boxed )
+string_list_to_string_list( const FMABoxed *boxed )
{
return( na_core_utils_slist_duplicate( boxed->private->u.string_list ));
}
static void
-string_list_to_value( const NABoxed *boxed, GValue *value )
+string_list_to_value( const FMABoxed *boxed, GValue *value )
{
g_value_set_pointer( value, na_core_utils_slist_duplicate( boxed->private->u.string_list ));
}
static void *
-string_list_to_void( const NABoxed *boxed )
+string_list_to_void( const FMABoxed *boxed )
{
void *value = NULL;
@@ -1256,7 +1256,7 @@ string_list_to_void( const NABoxed *boxed )
}
static gboolean
-locale_are_equal( const NABoxed *a, const NABoxed *b )
+locale_are_equal( const FMABoxed *a, const FMABoxed *b )
{
if( !a->private->u.string && !b->private->u.string ){
return( TRUE );
@@ -1268,69 +1268,69 @@ locale_are_equal( const NABoxed *a, const NABoxed *b )
}
static gboolean
-uint_are_equal( const NABoxed *a, const NABoxed *b )
+uint_are_equal( const FMABoxed *a, const FMABoxed *b )
{
return( a->private->u.uint == b->private->u.uint );
}
static void
-uint_copy( NABoxed *dest, const NABoxed *src )
+uint_copy( FMABoxed *dest, const FMABoxed *src )
{
dest->private->u.uint = src->private->u.uint;
dest->private->is_set = TRUE;
}
static void
-uint_free( NABoxed *boxed )
+uint_free( FMABoxed *boxed )
{
boxed->private->u.uint = 0;
boxed->private->is_set = FALSE;
}
static void
-uint_from_string( NABoxed *boxed, const gchar *string )
+uint_from_string( FMABoxed *boxed, const gchar *string )
{
boxed->private->u.uint = string ? atoi( string ) : 0;
}
static void
-uint_from_value( NABoxed *boxed, const GValue *value )
+uint_from_value( FMABoxed *boxed, const GValue *value )
{
boxed->private->u.uint = g_value_get_uint( value );
}
static void
-uint_from_void( NABoxed *boxed, const void *value )
+uint_from_void( FMABoxed *boxed, const void *value )
{
boxed->private->u.uint = GPOINTER_TO_UINT( value );
}
static gconstpointer
-uint_to_pointer( const NABoxed *boxed )
+uint_to_pointer( const FMABoxed *boxed )
{
return(( gconstpointer ) GUINT_TO_POINTER( boxed->private->u.uint ));
}
static gchar *
-uint_to_string( const NABoxed *boxed )
+uint_to_string( const FMABoxed *boxed )
{
return( g_strdup_printf( "%u", boxed->private->u.uint ));
}
static guint
-uint_to_uint( const NABoxed *boxed )
+uint_to_uint( const FMABoxed *boxed )
{
return( boxed->private->u.uint );
}
static void
-uint_to_value( const NABoxed *boxed, GValue *value )
+uint_to_value( const FMABoxed *boxed, GValue *value )
{
g_value_set_uint( value, boxed->private->u.uint );
}
static void *
-uint_to_void( const NABoxed *boxed )
+uint_to_void( const FMABoxed *boxed )
{
return( GUINT_TO_POINTER( boxed->private->u.uint ));
}
@@ -1341,7 +1341,7 @@ uint_to_void( const NABoxed *boxed )
* else just arbitrarily return -1
*/
static gboolean
-uint_list_are_equal( const NABoxed *a, const NABoxed *b )
+uint_list_are_equal( const FMABoxed *a, const FMABoxed *b )
{
GList *ia, *ib;
gboolean diff = FALSE;
@@ -1361,7 +1361,7 @@ uint_list_are_equal( const NABoxed *a, const NABoxed *b )
}
static void
-uint_list_copy( NABoxed *dest, const NABoxed *src )
+uint_list_copy( FMABoxed *dest, const FMABoxed *src )
{
GList *isrc;
@@ -1373,7 +1373,7 @@ uint_list_copy( NABoxed *dest, const NABoxed *src )
}
static void
-uint_list_free( NABoxed *boxed )
+uint_list_free( FMABoxed *boxed )
{
g_list_free( boxed->private->u.uint_list );
boxed->private->u.uint_list = NULL;
@@ -1381,7 +1381,7 @@ uint_list_free( NABoxed *boxed )
}
static void
-uint_list_from_string( NABoxed *boxed, const gchar *string )
+uint_list_from_string( FMABoxed *boxed, const gchar *string )
{
gchar **array;
gchar **i;
@@ -1403,7 +1403,7 @@ uint_list_from_string( NABoxed *boxed, const gchar *string )
}
static void
-uint_list_from_value( NABoxed *boxed, const GValue *value )
+uint_list_from_value( FMABoxed *boxed, const GValue *value )
{
if( g_value_get_pointer( value )){
boxed->private->u.uint_list = g_list_copy( g_value_get_pointer( value ));
@@ -1411,7 +1411,7 @@ uint_list_from_value( NABoxed *boxed, const GValue *value )
}
static void
-uint_list_from_void( NABoxed *boxed, const void *value )
+uint_list_from_void( FMABoxed *boxed, const void *value )
{
if( value ){
boxed->private->u.uint_list = g_list_copy(( GList * ) value );
@@ -1419,13 +1419,13 @@ uint_list_from_void( NABoxed *boxed, const void *value )
}
static gconstpointer
-uint_list_to_pointer( const NABoxed *boxed )
+uint_list_to_pointer( const FMABoxed *boxed )
{
return(( gconstpointer ) boxed->private->u.uint_list );
}
static gchar *
-uint_list_to_string( const NABoxed *boxed )
+uint_list_to_string( const FMABoxed *boxed )
{
GList *is;
GString *str = g_string_new( "" );
@@ -1444,19 +1444,19 @@ uint_list_to_string( const NABoxed *boxed )
}
static GList *
-uint_list_to_uint_list( const NABoxed *boxed )
+uint_list_to_uint_list( const FMABoxed *boxed )
{
return( g_list_copy( boxed->private->u.uint_list ));
}
static void
-uint_list_to_value( const NABoxed *boxed, GValue *value )
+uint_list_to_value( const FMABoxed *boxed, GValue *value )
{
g_value_set_pointer( value, g_list_copy( boxed->private->u.uint_list ));
}
static void *
-uint_list_to_void( const NABoxed *boxed )
+uint_list_to_void( const FMABoxed *boxed )
{
void *value = NULL;
diff --git a/src/core/na-data-boxed.c b/src/core/na-data-boxed.c
index 7a7bd9f..6246add 100644
--- a/src/core/na-data-boxed.c
+++ b/src/core/na-data-boxed.c
@@ -48,7 +48,7 @@ struct _NADataBoxedClassPrivate {
};
/* additional features of our data types
- * (see NABoxed class for primary features)
+ * (see FMABoxed class for primary features)
*/
typedef struct {
guint type;
@@ -174,7 +174,7 @@ register_type( void )
g_debug( "%s", thisfn );
- type = g_type_register_static( NA_TYPE_BOXED, "NADataBoxed", &info, 0 );
+ type = g_type_register_static( FMA_TYPE_BOXED, "NADataBoxed", &info, 0 );
return( type );
}
@@ -281,7 +281,7 @@ na_data_boxed_new( const NADataDef *def )
g_return_val_if_fail( def != NULL, NULL );
boxed = g_object_new( NA_TYPE_DATA_BOXED, NULL );
- na_boxed_set_type( NA_BOXED( boxed ), def->type );
+ fma_boxed_set_type( FMA_BOXED( boxed ), def->type );
boxed->private->data_def = def;
boxed->private->boxed_def = get_data_boxed_def( def->type );
@@ -376,7 +376,7 @@ na_data_boxed_get_param_spec( const NADataDef *def )
* Returns: %TRUE if the two boxeds are equal, %FALSE else.
*
* Since: 2.30
- * Deprecated: 3.1: Use na_boxed_are_equal() instead.
+ * Deprecated: 3.1: Use fma_boxed_are_equal() instead.
*/
gboolean
na_data_boxed_are_equal( const NADataBoxed *a, const NADataBoxed *b )
@@ -384,7 +384,7 @@ na_data_boxed_are_equal( const NADataBoxed *a, const NADataBoxed *b )
g_return_val_if_fail( NA_IS_DATA_BOXED( a ), FALSE );
g_return_val_if_fail( NA_IS_DATA_BOXED( b ), FALSE );
- return( na_boxed_are_equal( NA_BOXED( a ), NA_BOXED( b )));
+ return( fma_boxed_are_equal( FMA_BOXED( a ), FMA_BOXED( b )));
}
#endif /* NA_ENABLE_DEPRECATED */
@@ -451,12 +451,12 @@ na_data_boxed_is_valid( const NADataBoxed *boxed )
* Dump the content of @boxed.
*
* Since: 2.30
- * Deprecated: 3.1: Use na_boxed_dump() instead.
+ * Deprecated: 3.1: Use fma_boxed_dump() instead.
*/
void
na_data_boxed_dump( const NADataBoxed *boxed )
{
- na_boxed_dump( NA_BOXED( boxed ));
+ fma_boxed_dump( FMA_BOXED( boxed ));
}
/**
@@ -467,12 +467,12 @@ na_data_boxed_dump( const NADataBoxed *boxed )
* should be g_free() by the caller.
*
* Since: 2.30
- * Deprecated: 3.1: Use na_boxed_get_string() instead.
+ * Deprecated: 3.1: Use fma_boxed_get_string() instead.
*/
gchar *
na_data_boxed_get_as_string( const NADataBoxed *boxed )
{
- return( na_boxed_get_string( NA_BOXED( boxed )));
+ return( fma_boxed_get_string( FMA_BOXED( boxed )));
}
/**
@@ -483,12 +483,12 @@ na_data_boxed_get_as_string( const NADataBoxed *boxed )
* Setup @value with the content of the @boxed.
*
* Since: 2.30
- * Deprecated: 3.1: Use na_boxed_get_as_value() instead.
+ * Deprecated: 3.1: Use fma_boxed_get_as_value() instead.
*/
void
na_data_boxed_get_as_value( const NADataBoxed *boxed, GValue *value )
{
- na_boxed_get_as_value( NA_BOXED( boxed ), value );
+ fma_boxed_get_as_value( FMA_BOXED( boxed ), value );
}
/**
@@ -502,12 +502,12 @@ na_data_boxed_get_as_value( const NADataBoxed *boxed, GValue *value )
* allocated value, which should be released by the caller.
*
* Since: 2.30
- * Deprecated: 3.1: Use na_boxed_get_as_void() instead.
+ * Deprecated: 3.1: Use fma_boxed_get_as_void() instead.
*/
void *
na_data_boxed_get_as_void( const NADataBoxed *boxed )
{
- return( na_boxed_get_as_void( NA_BOXED( boxed )));
+ return( fma_boxed_get_as_void( FMA_BOXED( boxed )));
}
/**
@@ -518,12 +518,12 @@ na_data_boxed_get_as_void( const NADataBoxed *boxed )
* Copy value from @value to @boxed.
*
* Since: 2.30
- * Deprecated: 3.1: Use na_boxed_set_from_boxed() instead.
+ * Deprecated: 3.1: Use fma_boxed_set_from_boxed() instead.
*/
void
na_data_boxed_set_from_boxed( NADataBoxed *boxed, const NADataBoxed *value )
{
- na_boxed_set_from_boxed( NA_BOXED( boxed ), NA_BOXED( value ));
+ fma_boxed_set_from_boxed( FMA_BOXED( boxed ), FMA_BOXED( value ));
}
/**
@@ -534,12 +534,12 @@ na_data_boxed_set_from_boxed( NADataBoxed *boxed, const NADataBoxed *value )
* Evaluates the @value and set it to the @boxed.
*
* Since: 2.30
- * Deprecated: 3.1: Use na_boxed_set_from_string() instead.
+ * Deprecated: 3.1: Use fma_boxed_set_from_string() instead.
*/
void
na_data_boxed_set_from_string( NADataBoxed *boxed, const gchar *value )
{
- na_boxed_set_from_string( NA_BOXED( boxed ), value );
+ fma_boxed_set_from_string( FMA_BOXED( boxed ), value );
}
/**
@@ -550,12 +550,12 @@ na_data_boxed_set_from_string( NADataBoxed *boxed, const gchar *value )
* Evaluates the @value and set it to the @boxed.
*
* Since: 2.30
- * Deprecated: 3.1: Use na_boxed_set_from_value() instead.
+ * Deprecated: 3.1: Use fma_boxed_set_from_value() instead.
*/
void
na_data_boxed_set_from_value( NADataBoxed *boxed, const GValue *value )
{
- na_boxed_set_from_value( NA_BOXED( boxed ), value );
+ fma_boxed_set_from_value( FMA_BOXED( boxed ), value );
}
/**
@@ -566,12 +566,12 @@ na_data_boxed_set_from_value( NADataBoxed *boxed, const GValue *value )
* Evaluates the @value and set it to the @boxed.
*
* Since: 2.30
- * Deprecated: 3.1: Use na_boxed_set_from_void() instead.
+ * Deprecated: 3.1: Use fma_boxed_set_from_void() instead.
*/
void
na_data_boxed_set_from_void( NADataBoxed *boxed, const void *value )
{
- na_boxed_set_from_void( NA_BOXED( boxed ), value );
+ fma_boxed_set_from_void( FMA_BOXED( boxed ), value );
}
#endif /* NA_ENABLE_DEPRECATED */
@@ -594,7 +594,7 @@ bool_is_default( const NADataBoxed *boxed )
if( boxed->private->data_def->default_value && strlen( boxed->private->data_def->default_value )){
default_value = na_core_utils_boolean_from_string( boxed->private->data_def->default_value );
- is_default = ( default_value == na_boxed_get_boolean( NA_BOXED( boxed )));
+ is_default = ( default_value == fma_boxed_get_boolean( FMA_BOXED( boxed )));
}
return( is_default );
@@ -634,7 +634,7 @@ pointer_is_valid( const NADataBoxed *boxed )
gconstpointer pointer;
if( boxed->private->data_def->mandatory ){
- pointer = na_boxed_get_pointer( NA_BOXED( boxed ));
+ pointer = fma_boxed_get_pointer( FMA_BOXED( boxed ));
if( !pointer ){
g_debug( "na_data_boxed_pointer_is_valid: invalid %s: mandatory but null",
boxed->private->data_def->name );
is_valid = FALSE;
@@ -659,7 +659,7 @@ static gboolean
string_is_default( const NADataBoxed *boxed )
{
gboolean is_default = FALSE;
- gchar *value = na_boxed_get_string( NA_BOXED( boxed ));
+ gchar *value = fma_boxed_get_string( FMA_BOXED( boxed ));
if( boxed->private->data_def->default_value && strlen( boxed->private->data_def->default_value )){
if( value && strlen( value )){
@@ -690,7 +690,7 @@ string_is_valid( const NADataBoxed *boxed )
gboolean is_valid = TRUE;
if( boxed->private->data_def->mandatory ){
- gchar *value = na_boxed_get_string( NA_BOXED( boxed ));
+ gchar *value = fma_boxed_get_string( FMA_BOXED( boxed ));
if( !value || !strlen( value )){
g_debug( "na_data_boxed_string_is_valid: invalid %s: mandatory but empty or null",
boxed->private->data_def->name );
is_valid = FALSE;
@@ -715,7 +715,7 @@ static gboolean
string_list_is_default( const NADataBoxed *boxed )
{
gboolean is_default = FALSE;
- gchar *value = na_boxed_get_string( NA_BOXED( boxed ));
+ gchar *value = fma_boxed_get_string( FMA_BOXED( boxed ));
if( boxed->private->data_def->default_value && strlen( boxed->private->data_def->default_value )){
if( value && strlen( value )){
@@ -739,7 +739,7 @@ string_list_is_valid( const NADataBoxed *boxed )
gboolean is_valid = TRUE;
if( boxed->private->data_def->mandatory ){
- gchar *value = na_boxed_get_string( NA_BOXED( boxed ));
+ gchar *value = fma_boxed_get_string( FMA_BOXED( boxed ));
if( !value || !strlen( value )){
g_debug( "na_data_boxed_string_list_is_valid: invalid %s: mandatory but empty or
null", boxed->private->data_def->name );
is_valid = FALSE;
@@ -753,7 +753,7 @@ static gboolean
locale_is_default( const NADataBoxed *boxed )
{
gboolean is_default = FALSE;
- gchar *value = na_boxed_get_string( NA_BOXED( boxed ));
+ gchar *value = fma_boxed_get_string( FMA_BOXED( boxed ));
if( boxed->private->data_def->default_value && g_utf8_strlen(
boxed->private->data_def->default_value, -1 )){
if( value && strlen( value )){
@@ -783,7 +783,7 @@ locale_is_valid( const NADataBoxed *boxed )
gboolean is_valid = TRUE;
if( boxed->private->data_def->mandatory ){
- gchar *value = na_boxed_get_string( NA_BOXED( boxed ));
+ gchar *value = fma_boxed_get_string( FMA_BOXED( boxed ));
if( !value || !g_utf8_strlen( value, -1 )){
g_debug( "na_data_boxed_locale_is_valid: invalid %s: mandatory but empty or null",
boxed->private->data_def->name );
is_valid = FALSE;
@@ -815,7 +815,7 @@ uint_is_default( const NADataBoxed *boxed )
if( boxed->private->data_def->default_value ){
default_value = atoi( boxed->private->data_def->default_value );
- is_default = ( na_boxed_get_uint( NA_BOXED( boxed )) == default_value );
+ is_default = ( fma_boxed_get_uint( FMA_BOXED( boxed )) == default_value );
}
return( is_default );
@@ -852,7 +852,7 @@ uint_list_is_valid( const NADataBoxed *boxed )
gboolean is_valid = TRUE;
if( boxed->private->data_def->mandatory ){
- gchar *value = na_boxed_get_string( NA_BOXED( boxed ));
+ gchar *value = fma_boxed_get_string( FMA_BOXED( boxed ));
if( !value || !strlen( value )){
g_debug( "na_data_boxed_uint_list_is_valid: invalid %s: mandatory but empty or null",
boxed->private->data_def->name );
is_valid = FALSE;
diff --git a/src/core/na-factory-object.c b/src/core/na-factory-object.c
index 3bc27b7..bb60357 100644
--- a/src/core/na-factory-object.c
+++ b/src/core/na-factory-object.c
@@ -310,7 +310,7 @@ set_defaults_iter( NADataDef *def, NafoDefaultIter *data )
if( !boxed ){
boxed = na_data_boxed_new( def );
attach_boxed_to_object( data->object, boxed );
- na_boxed_set_from_string( NA_BOXED( boxed ), def->default_value );
+ fma_boxed_set_from_string( FMA_BOXED( boxed ), def->default_value );
}
/* do not stop */
@@ -402,7 +402,7 @@ na_factory_object_copy( NAIFactoryObject *target, const NAIFactoryObject *source
tgt_boxed = na_data_boxed_new( def );
attach_boxed_to_object( target, tgt_boxed );
}
- na_boxed_set_from_boxed( NA_BOXED( tgt_boxed ), NA_BOXED( boxed ));
+ fma_boxed_set_from_boxed( FMA_BOXED( tgt_boxed ), FMA_BOXED( boxed ));
}
}
@@ -446,7 +446,7 @@ na_factory_object_are_equal( const NAIFactoryObject *a, const NAIFactoryObject *
NADataBoxed *b_boxed = na_ifactory_object_get_data_boxed( b, a_def->name );
if( b_boxed ){
- are_equal = na_boxed_are_equal( NA_BOXED( a_boxed ), NA_BOXED( b_boxed ));
+ are_equal = fma_boxed_are_equal( FMA_BOXED( a_boxed ), FMA_BOXED( b_boxed ));
if( !are_equal ){
g_debug( "%s: %s not equal as %s different", thisfn,
G_OBJECT_TYPE_NAME( a ), a_def->name );
}
@@ -567,7 +567,7 @@ na_factory_object_dump( const NAIFactoryObject *object )
for( it = list ; it ; it = it->next ){
NADataBoxed *boxed = NA_DATA_BOXED( it->data );
const NADataDef *def = na_data_boxed_get_data_def( boxed );
- gchar *value = na_boxed_get_string( NA_BOXED( boxed ));
+ gchar *value = fma_boxed_get_string( FMA_BOXED( boxed ));
g_debug( "| %s: %*s=%s", thisfn, length, def->name+l_prefix, value );
g_free( value );
}
@@ -639,7 +639,7 @@ read_data_iter( NADataDef *def, NafoReadIter *iter )
NADataBoxed *exist = na_ifactory_object_get_data_boxed( iter->object, def->name );
if( exist ){
- na_boxed_set_from_boxed( NA_BOXED( exist ), NA_BOXED( boxed ));
+ fma_boxed_set_from_boxed( FMA_BOXED( exist ), FMA_BOXED( boxed ));
g_object_unref( boxed );
} else {
@@ -743,7 +743,7 @@ na_factory_object_get_as_value( const NAIFactoryObject *object, const gchar *nam
boxed = na_ifactory_object_get_data_boxed( object, name );
if( boxed ){
- na_boxed_get_as_value( NA_BOXED( boxed ), value );
+ fma_boxed_get_as_value( FMA_BOXED( boxed ), value );
}
}
@@ -771,7 +771,7 @@ na_factory_object_get_as_void( const NAIFactoryObject *object, const gchar *name
boxed = na_ifactory_object_get_data_boxed( object, name );
if( boxed ){
- value = na_boxed_get_as_void( NA_BOXED( boxed ));
+ value = fma_boxed_get_as_void( FMA_BOXED( boxed ));
}
return( value );
@@ -814,7 +814,7 @@ na_factory_object_set_from_value( NAIFactoryObject *object, const gchar *name, c
NADataBoxed *boxed = na_ifactory_object_get_data_boxed( object, name );
if( boxed ){
- na_boxed_set_from_value( NA_BOXED( boxed ), value );
+ fma_boxed_set_from_value( FMA_BOXED( boxed ), value );
} else {
NADataDef *def = na_factory_object_get_data_def( object, name );
@@ -823,7 +823,7 @@ na_factory_object_set_from_value( NAIFactoryObject *object, const gchar *name, c
} else {
boxed = na_data_boxed_new( def );
- na_boxed_set_from_value( NA_BOXED( boxed ), value );
+ fma_boxed_set_from_value( FMA_BOXED( boxed ), value );
attach_boxed_to_object( object, boxed );
}
}
@@ -846,7 +846,7 @@ na_factory_object_set_from_void( NAIFactoryObject *object, const gchar *name, co
NADataBoxed *boxed = na_ifactory_object_get_data_boxed( object, name );
if( boxed ){
- na_boxed_set_from_void( NA_BOXED( boxed ), data );
+ fma_boxed_set_from_void( FMA_BOXED( boxed ), data );
} else {
NADataDef *def = na_factory_object_get_data_def( object, name );
@@ -855,7 +855,7 @@ na_factory_object_set_from_void( NAIFactoryObject *object, const gchar *name, co
} else {
boxed = na_data_boxed_new( def );
- na_boxed_set_from_void( NA_BOXED( boxed ), data );
+ fma_boxed_set_from_void( FMA_BOXED( boxed ), data );
attach_boxed_to_object( object, boxed );
}
}
diff --git a/src/core/na-settings.c b/src/core/na-settings.c
index 75a6cd9..68ea994 100644
--- a/src/core/na-settings.c
+++ b/src/core/na-settings.c
@@ -36,7 +36,7 @@
#include <string.h>
#include <strings.h>
-#include "api/na-boxed.h"
+#include "api/fma-boxed.h"
#include "api/na-data-types.h"
#include "api/na-core-utils.h"
#include "api/na-timeout.h"
@@ -198,7 +198,7 @@ typedef struct {
const KeyDef *def;
const gchar *group;
gboolean mandatory;
- NABoxed *boxed;
+ FMABoxed *boxed;
}
KeyValue;
@@ -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, NABoxed
*new_value, gboolean mandatory );
+static void on_key_changed_final_handler( NASettings *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 );
@@ -297,14 +297,14 @@ class_init( NASettingsClass *klass )
*
* This signal is sent by NASettings when the value of a key is modified.
*
- * Arguments are the group, the key, the new value as a NABoxed,
+ * 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,
* const gchar *group,
* const gchar *key,
- * NABoxed *value,
+ * FMABoxed *value,
* gboolean mandatory,
* gpointer user_data );
*
@@ -544,7 +544,7 @@ na_settings_get_boolean_ex( const gchar *group, const gchar *key, gboolean *foun
key_value = read_key_value( group, key, found, mandatory );
if( key_value ){
- value = na_boxed_get_boolean( key_value->boxed );
+ value = fma_boxed_get_boolean( key_value->boxed );
release_key_value( key_value );
} else {
@@ -587,7 +587,7 @@ na_settings_get_string( const gchar *key, gboolean *found, gboolean *mandatory )
key_value = read_key_value( NULL, key, found, mandatory );
if( key_value ){
- value = na_boxed_get_string( key_value->boxed );
+ value = fma_boxed_get_string( key_value->boxed );
release_key_value( key_value );
} else {
@@ -630,7 +630,7 @@ na_settings_get_string_list( const gchar *key, gboolean *found, gboolean *mandat
key_value = read_key_value( NULL, key, found, mandatory );
if( key_value ){
- value = na_boxed_get_string_list( key_value->boxed );
+ value = fma_boxed_get_string_list( key_value->boxed );
release_key_value( key_value );
} else {
@@ -672,7 +672,7 @@ na_settings_get_uint( const gchar *key, gboolean *found, gboolean *mandatory )
key_value = read_key_value( NULL, key, found, mandatory );
if( key_value ){
- value = na_boxed_get_uint( key_value->boxed );
+ value = fma_boxed_get_uint( key_value->boxed );
release_key_value( key_value );
} else {
@@ -715,7 +715,7 @@ na_settings_get_uint_list( const gchar *key, gboolean *found, gboolean *mandator
key_value = read_key_value( NULL, key, found, mandatory );
if( key_value ){
- value = na_boxed_get_uint_list( key_value->boxed );
+ value = fma_boxed_get_uint_list( key_value->boxed );
release_key_value( key_value );
} else {
@@ -996,13 +996,13 @@ content_diff( GList *old, GList *new )
knew = ( KeyValue * ) in->data;
if( !strcmp( kold->group, knew->group ) && ( gpointer ) kold->def == ( gpointer )
knew->def ){
found = TRUE;
- if( !na_boxed_are_equal( kold->boxed, knew->boxed )){
+ if( !fma_boxed_are_equal( kold->boxed, knew->boxed )){
/* a key has been modified */
kdiff = g_new0( KeyValue, 1 );
kdiff->group = g_strdup( knew->group );
kdiff->def = knew->def;
kdiff->mandatory = knew->mandatory;
- kdiff->boxed = na_boxed_copy( knew->boxed );
+ kdiff->boxed = fma_boxed_copy( knew->boxed );
diffs = g_list_prepend( diffs, kdiff );
}
}
@@ -1013,7 +1013,7 @@ content_diff( GList *old, GList *new )
kdiff->group = g_strdup( kold->group );
kdiff->def = kold->def;
kdiff->mandatory = FALSE;
- kdiff->boxed = na_boxed_new_from_string( kold->def->type, kold->def->default_value );
+ kdiff->boxed = fma_boxed_new_from_string( kold->def->type, kold->def->default_value );
diffs = g_list_prepend( diffs, kdiff );
}
}
@@ -1033,7 +1033,7 @@ content_diff( GList *old, GList *new )
kdiff->group = g_strdup( knew->group );
kdiff->def = knew->def;
kdiff->mandatory = knew->mandatory;
- kdiff->boxed = na_boxed_copy( knew->boxed );
+ kdiff->boxed = fma_boxed_copy( knew->boxed );
diffs = g_list_prepend( diffs, kdiff );
}
}
@@ -1191,7 +1191,7 @@ on_keyfile_changed_timeout( void )
g_debug( "%s: %d found update(s)", thisfn, g_list_length( modifs ));
for( im = modifs ; im ; im = im->next ){
changed = ( const KeyValue * ) im->data;
- value = na_boxed_get_string( changed->boxed );
+ value = fma_boxed_get_string( changed->boxed );
g_debug( "%s: group=%s, key=%s, value=%s", thisfn, changed->group, changed->def->key, value );
g_free( value );
}
@@ -1219,7 +1219,7 @@ on_keyfile_changed_timeout( void )
( *( NASettingsKeyCallback ) consumer->callback )(
changed->group,
changed->def->key,
- na_boxed_get_pointer( changed->boxed ),
+ fma_boxed_get_pointer( changed->boxed ),
changed->mandatory,
consumer->user_data );
}
@@ -1244,10 +1244,10 @@ on_keyfile_changed_timeout( void )
}
static void
-on_key_changed_final_handler( NASettings *settings, gchar *group, gchar *key, NABoxed *new_value, gboolean
mandatory )
+on_key_changed_final_handler( NASettings *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 );
- na_boxed_dump( new_value );
+ fma_boxed_dump( new_value );
}
static KeyValue *
@@ -1352,7 +1352,7 @@ read_key_value_from_key_file( KeyFile *keyfile, const gchar *group, const gchar
case NA_DATA_TYPE_BOOLEAN:
case NA_DATA_TYPE_STRING_LIST:
case NA_DATA_TYPE_UINT_LIST:
- value->boxed = na_boxed_new_from_string( key_def->type, str );
+ value->boxed = fma_boxed_new_from_string( key_def->type, str
);
break;
}
}
diff --git a/src/io-desktop/nadp-reader.c b/src/io-desktop/nadp-reader.c
index 99416c0..0b8d202 100644
--- a/src/io-desktop/nadp-reader.c
+++ b/src/io-desktop/nadp-reader.c
@@ -525,7 +525,7 @@ nadp_reader_ifactory_provider_read_data( const NAIFactoryProvider *reader, void
str_value = nadp_desktop_file_get_locale_string( nrd->ndf, group,
def->desktop_entry, &found, def->default_value );
if( found ){
boxed = na_data_boxed_new( def );
- na_boxed_set_from_void( NA_BOXED( boxed ), str_value );
+ fma_boxed_set_from_void( FMA_BOXED( boxed ), str_value );
}
g_free( str_value );
break;
@@ -534,7 +534,7 @@ nadp_reader_ifactory_provider_read_data( const NAIFactoryProvider *reader, void
str_value = nadp_desktop_file_get_string( nrd->ndf, group,
def->desktop_entry, &found, def->default_value );
if( found ){
boxed = na_data_boxed_new( def );
- na_boxed_set_from_void( NA_BOXED( boxed ), str_value );
+ fma_boxed_set_from_void( FMA_BOXED( boxed ), str_value );
}
g_free( str_value );
break;
@@ -543,7 +543,7 @@ nadp_reader_ifactory_provider_read_data( const NAIFactoryProvider *reader, void
bool_value = nadp_desktop_file_get_boolean( nrd->ndf, group,
def->desktop_entry, &found, na_core_utils_boolean_from_string( def->default_value ));
if( found ){
boxed = na_data_boxed_new( def );
- na_boxed_set_from_void( NA_BOXED( boxed ), GUINT_TO_POINTER(
bool_value ));
+ fma_boxed_set_from_void( FMA_BOXED( boxed ),
GUINT_TO_POINTER( bool_value ));
}
break;
@@ -551,7 +551,7 @@ nadp_reader_ifactory_provider_read_data( const NAIFactoryProvider *reader, void
slist_value = nadp_desktop_file_get_string_list( nrd->ndf, group,
def->desktop_entry, &found, def->default_value );
if( found ){
boxed = na_data_boxed_new( def );
- na_boxed_set_from_void( NA_BOXED( boxed ), slist_value );
+ fma_boxed_set_from_void( FMA_BOXED( boxed ), slist_value );
}
na_core_utils_slist_free( slist_value );
break;
@@ -560,7 +560,7 @@ nadp_reader_ifactory_provider_read_data( const NAIFactoryProvider *reader, void
uint_value = nadp_desktop_file_get_uint( nrd->ndf, group,
def->desktop_entry, &found, atoi( def->default_value ));
if( found ){
boxed = na_data_boxed_new( def );
- na_boxed_set_from_void( NA_BOXED( boxed ), GUINT_TO_POINTER(
uint_value ));
+ fma_boxed_set_from_void( FMA_BOXED( boxed ),
GUINT_TO_POINTER( uint_value ));
}
break;
diff --git a/src/io-desktop/nadp-writer.c b/src/io-desktop/nadp-writer.c
index 6db499e..2993e67 100644
--- a/src/io-desktop/nadp-writer.c
+++ b/src/io-desktop/nadp-writer.c
@@ -537,7 +537,7 @@ nadp_writer_ifactory_provider_write_data(
switch( def->type ){
case NA_DATA_TYPE_STRING:
- str_value = na_boxed_get_string( NA_BOXED( boxed ));
+ str_value = fma_boxed_get_string( FMA_BOXED( boxed ));
if( !strcmp( def->name, NAFO_DATA_PATH )){
parms = na_object_get_parameters( object );
@@ -552,24 +552,24 @@ nadp_writer_ifactory_provider_write_data(
break;
case NA_DATA_TYPE_LOCALE_STRING:
- str_value = na_boxed_get_string( NA_BOXED( boxed ));
+ str_value = fma_boxed_get_string( FMA_BOXED( boxed ));
nadp_desktop_file_set_locale_string( ndf, group_name,
def->desktop_entry, str_value );
g_free( str_value );
break;
case NA_DATA_TYPE_BOOLEAN:
- bool_value = GPOINTER_TO_UINT( na_boxed_get_as_void( NA_BOXED( boxed
)));
+ bool_value = GPOINTER_TO_UINT( fma_boxed_get_as_void( FMA_BOXED(
boxed )));
nadp_desktop_file_set_boolean( ndf, group_name, def->desktop_entry,
bool_value );
break;
case NA_DATA_TYPE_STRING_LIST:
- slist_value = ( GSList * ) na_boxed_get_as_void( NA_BOXED( boxed ));
+ slist_value = ( GSList * ) fma_boxed_get_as_void( FMA_BOXED( boxed ));
nadp_desktop_file_set_string_list( ndf, group_name,
def->desktop_entry, slist_value );
na_core_utils_slist_free( slist_value );
break;
case NA_DATA_TYPE_UINT:
- uint_value = GPOINTER_TO_UINT( na_boxed_get_as_void( NA_BOXED( boxed
)));
+ uint_value = GPOINTER_TO_UINT( fma_boxed_get_as_void( FMA_BOXED(
boxed )));
nadp_desktop_file_set_uint( ndf, group_name, def->desktop_entry,
uint_value );
break;
diff --git a/src/io-gconf/nagp-reader.c b/src/io-gconf/nagp-reader.c
index 92b389e..9446a29 100644
--- a/src/io-gconf/nagp-reader.c
+++ b/src/io-gconf/nagp-reader.c
@@ -379,24 +379,24 @@ get_boxed_from_path( const NagpGConfProvider *provider, const gchar *path, Reade
case NA_DATA_TYPE_STRING:
case NA_DATA_TYPE_LOCALE_STRING:
str_value = na_gconf_utils_read_string( provider->private->gconf, entry_path,
TRUE, NULL );
- na_boxed_set_from_string( NA_BOXED( boxed ), str_value );
+ fma_boxed_set_from_string( FMA_BOXED( boxed ), str_value );
g_free( str_value );
break;
case NA_DATA_TYPE_BOOLEAN:
bool_value = na_gconf_utils_read_bool( provider->private->gconf, entry_path,
TRUE, FALSE );
- na_boxed_set_from_void( NA_BOXED( boxed ), GUINT_TO_POINTER( bool_value ));
+ fma_boxed_set_from_void( FMA_BOXED( boxed ), GUINT_TO_POINTER( bool_value ));
break;
case NA_DATA_TYPE_STRING_LIST:
slist_value = na_gconf_utils_read_string_list( provider->private->gconf,
entry_path );
- na_boxed_set_from_void( NA_BOXED( boxed ), slist_value );
+ fma_boxed_set_from_void( FMA_BOXED( boxed ), slist_value );
na_core_utils_slist_free( slist_value );
break;
case NA_DATA_TYPE_UINT:
int_value = na_gconf_utils_read_int( provider->private->gconf, entry_path,
TRUE, 0 );
- na_boxed_set_from_void( NA_BOXED( boxed ), GUINT_TO_POINTER( int_value ));
+ fma_boxed_set_from_void( FMA_BOXED( boxed ), GUINT_TO_POINTER( int_value ));
break;
default:
diff --git a/src/io-gconf/nagp-writer.c b/src/io-gconf/nagp-writer.c
index 4d27636..f2d0923 100644
--- a/src/io-gconf/nagp-writer.c
+++ b/src/io-gconf/nagp-writer.c
@@ -323,7 +323,7 @@ nagp_writer_write_data( const NAIFactoryProvider *provider, void *writer_data,
switch( def->type ){
case NA_DATA_TYPE_STRING:
- str_value = na_boxed_get_string( NA_BOXED( boxed ));
+ str_value = fma_boxed_get_string( FMA_BOXED( boxed ));
na_gconf_utils_write_string( gconf, path, str_value, &msg );
if( msg ){
*messages = g_slist_append( *messages, msg );
@@ -333,7 +333,7 @@ nagp_writer_write_data( const NAIFactoryProvider *provider, void *writer_data,
break;
case NA_DATA_TYPE_LOCALE_STRING:
- str_value = na_boxed_get_string( NA_BOXED( boxed ));
+ str_value = fma_boxed_get_string( FMA_BOXED( boxed ));
na_gconf_utils_write_string( gconf, path, str_value, &msg );
if( msg ){
*messages = g_slist_append( *messages, msg );
@@ -343,7 +343,7 @@ nagp_writer_write_data( const NAIFactoryProvider *provider, void *writer_data,
break;
case NA_DATA_TYPE_BOOLEAN:
- bool_value = GPOINTER_TO_UINT( na_boxed_get_as_void( NA_BOXED( boxed )));
+ bool_value = GPOINTER_TO_UINT( fma_boxed_get_as_void( FMA_BOXED( boxed )));
na_gconf_utils_write_bool( gconf, path, bool_value, &msg );
if( msg ){
*messages = g_slist_append( *messages, msg );
@@ -352,7 +352,7 @@ nagp_writer_write_data( const NAIFactoryProvider *provider, void *writer_data,
break;
case NA_DATA_TYPE_STRING_LIST:
- slist_value = ( GSList * ) na_boxed_get_as_void( NA_BOXED( boxed ));
+ slist_value = ( GSList * ) fma_boxed_get_as_void( FMA_BOXED( boxed ));
na_gconf_utils_write_string_list( gconf, path, slist_value, &msg );
if( msg ){
*messages = g_slist_append( *messages, msg );
@@ -362,7 +362,7 @@ nagp_writer_write_data( const NAIFactoryProvider *provider, void *writer_data,
break;
case NA_DATA_TYPE_UINT:
- uint_value = GPOINTER_TO_UINT( na_boxed_get_as_void( NA_BOXED( boxed )));
+ uint_value = GPOINTER_TO_UINT( fma_boxed_get_as_void( FMA_BOXED( boxed )));
na_gconf_utils_write_int( gconf, path, uint_value, &msg );
if( msg ){
*messages = g_slist_append( *messages, msg );
diff --git a/src/io-xml/naxml-reader.c b/src/io-xml/naxml-reader.c
index 178b5f3..5d72658 100644
--- a/src/io-xml/naxml-reader.c
+++ b/src/io-xml/naxml-reader.c
@@ -743,7 +743,7 @@ read_data_boxed_from_node( NAXMLReader *reader, xmlChar *path, xmlNode *parent,
if( reader->private->root_node_str->fn_get_value ){
value = ( *reader->private->root_node_str->fn_get_value )( reader, parent, def );
boxed = na_data_boxed_new( def );
- na_boxed_set_from_string( NA_BOXED( boxed ), value );
+ fma_boxed_set_from_string( FMA_BOXED( boxed ), value );
g_free( value );
}
}
@@ -1208,7 +1208,7 @@ dump_check_for_type( NAXMLReader *reader, xmlNode *key_node )
}
/*
- * string list is converted to GSList, then to a NABoxed string list 'value;value'
+ * string list is converted to GSList, then to a FMABoxed string list 'value;value'
*/
static gchar *
dump_read_value( NAXMLReader *reader, xmlNode *node, const NADataDef *def )
@@ -1266,7 +1266,7 @@ dump_read_value( NAXMLReader *reader, xmlNode *node, const NADataDef *def )
}
/*
- * NABoxed accepts a string list as a semi-comma-separated list of strings
+ * FMABoxed accepts a string list as a semi-comma-separated list of strings
*/
static gchar *
slist_to_string( GSList *slist )
diff --git a/src/io-xml/naxml-writer.c b/src/io-xml/naxml-writer.c
index 6e20439..c944609 100644
--- a/src/io-xml/naxml-writer.c
+++ b/src/io-xml/naxml-writer.c
@@ -547,7 +547,7 @@ write_data_schema_v2( NAXMLWriter *writer, const NAObjectId *object, const NADat
gchar *value_str;
gchar *tmp;
- value_str = na_boxed_get_string( NA_BOXED( boxed ));
+ value_str = fma_boxed_get_string( FMA_BOXED( boxed ));
/* boolean value must be lowercase
*/
@@ -659,7 +659,7 @@ write_data_dump( NAXMLWriter *writer, const NAObjectId *object, const NADataBoxe
gchar *value_str;
gchar *tmp;
- value_str = na_boxed_get_string( NA_BOXED( boxed ));
+ value_str = fma_boxed_get_string( FMA_BOXED( boxed ));
/* boolean value must be lowercase
*/
@@ -711,7 +711,7 @@ write_data_dump_element( NAXMLWriter *writer, const NADataDef *def, const NAData
value_list_node = xmlNewChild( value_node, NULL, BAD_CAST( NAXML_KEY_DUMP_NODE_VALUE_LIST ),
NULL );
xmlNewProp( value_list_node, BAD_CAST( NAXML_KEY_DUMP_NODE_VALUE_LIST_PARM_TYPE ), BAD_CAST(
NAXML_KEY_DUMP_NODE_VALUE_TYPE_STRING ));
value_list_value_node = xmlNewChild( value_list_node, NULL, BAD_CAST(
NAXML_KEY_DUMP_NODE_VALUE ), NULL );
- list = ( GSList * ) na_boxed_get_as_void( NA_BOXED( boxed ));
+ list = ( GSList * ) fma_boxed_get_as_void( FMA_BOXED( boxed ));
for( is = list ; is ; is = is->next ){
encoded_content = xmlEncodeSpecialChars( writer->private->doc, BAD_CAST(( gchar * )
is->data ));
diff --git a/src/nact/Makefile.am b/src/nact/Makefile.am
index 697231b..ea3d1a7 100644
--- a/src/nact/Makefile.am
+++ b/src/nact/Makefile.am
@@ -26,7 +26,7 @@
# ... and many others (see AUTHORS)
bin_PROGRAMS = \
- file-manager-actions-config-tool \
+ fma-config-tool \
$(NULL)
ui_datadir = $(pkgdatadir)/ui
@@ -46,7 +46,7 @@ AM_CPPFLAGS += \
BUILT_SOURCES = \
$(NULL)
-nautilus_actions_config_tool_SOURCES = \
+fma_config_tool_SOURCES = \
base-assistant.c \
base-assistant.h \
base-builder.c \
@@ -143,13 +143,13 @@ nautilus_actions_config_tool_SOURCES = \
$(BUILT_SOURCES) \
$(NULL)
-nautilus_actions_config_tool_LDADD = \
+fma_config_tool_LDADD = \
$(top_builddir)/src/core/libna-core.la \
$(NAUTILUS_ACTIONS_LIBS) \
$(NULL)
actions_files = \
- file-manager-actions-config-tool.actions \
+ nautilus-actions-config-tool.actions \
$(NULL)
ui_files = \
diff --git a/src/plugin-menu/Makefile.am b/src/plugin-menu/Makefile.am
index 4cf4c0d..43f6edc 100644
--- a/src/plugin-menu/Makefile.am
+++ b/src/plugin-menu/Makefile.am
@@ -34,12 +34,12 @@ AM_CPPFLAGS += \
nautilus_extensiondir = $(NAUTILUS_EXTENSIONS_DIR)
-nautilus_extension_LTLIBRARIES = libfile-manager-actions-menu.la
+nautilus_extension_LTLIBRARIES = libnautilus-actions-menu.la
libnautilus_actions_menu_la_SOURCES = \
nautilus-module.c
\
- file-manager-actions.c
\
- file-manager-actions.h
\
+ nautilus-actions.c
\
+ nautilus-actions.h
\
$(NULL)
libnautilus_actions_menu_la_LIBADD = \
diff --git a/src/plugin-menu/README b/src/plugin-menu/README
index 0b12d7c..0147e4e 100644
--- a/src/plugin-menu/README
+++ b/src/plugin-menu/README
@@ -1,7 +1,11 @@
-This is the Nautilus-Actions plugin.
+src/plugin-menu
+---------------
+This is the FileManager-Actions plugin.
The plugin is dynamically loaded by the Nautilus file manager.
Please put only here code relevant to the plugin, and to itself only.
I.e., code shared by the plugin with some other part of the package
should go to runtime convenience library.
+
+P. Wieser, last updated on sept. 2015
diff --git a/src/plugin-menu/nautilus-actions.c b/src/plugin-menu/nautilus-actions.c
index e87e705..2e321fd 100644
--- a/src/plugin-menu/nautilus-actions.c
+++ b/src/plugin-menu/nautilus-actions.c
@@ -48,7 +48,7 @@
#include <core/na-selected-info.h>
#include <core/na-tokens.h>
-#include "file-manager-actions.h"
+#include "nautilus-actions.h"
/* private class data
*/
diff --git a/src/plugin-menu/nautilus-module.c b/src/plugin-menu/nautilus-module.c
index fb4ebdc..c32f1f8 100644
--- a/src/plugin-menu/nautilus-module.c
+++ b/src/plugin-menu/nautilus-module.c
@@ -40,7 +40,7 @@
#include <core/na-gconf-migration.h>
#include <core/na-settings.h>
-#include "file-manager-actions.h"
+#include "nautilus-actions.h"
static void set_log_handler( void );
static void log_handler( const gchar *log_domain, GLogLevelFlags log_level, const gchar *message, gpointer
user_data );
diff --git a/src/plugin-tracker/Makefile.am b/src/plugin-tracker/Makefile.am
index 26d6428..b4aaab2 100644
--- a/src/plugin-tracker/Makefile.am
+++ b/src/plugin-tracker/Makefile.am
@@ -34,7 +34,7 @@ AM_CPPFLAGS += \
nautilus_extensiondir = $(NAUTILUS_EXTENSIONS_DIR)
-nautilus_extension_LTLIBRARIES = libfile-manager-actions-tracker.la
+nautilus_extension_LTLIBRARIES = libnautilus-actions-tracker.la
BUILT_SOURCES =
diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am
index 32ef2f9..13a082e 100644
--- a/src/utils/Makefile.am
+++ b/src/utils/Makefile.am
@@ -31,9 +31,9 @@ NA_UTILS_LDADD = \
$(NULL)
bin_PROGRAMS = \
- file-manager-actions-new
\
- file-manager-actions-print
\
- file-manager-actions-run
\
+ nautilus-actions-new \
+ nautilus-actions-print \
+ nautilus-actions-run \
$(NULL)
pkglibexec_PROGRAMS = \
@@ -50,7 +50,7 @@ AM_CPPFLAGS += \
$(NULL)
nautilus_actions_new_SOURCES = \
- file-manager-actions-new.c
\
+ nautilus-actions-new.c \
console-utils.c
\
console-utils.h
\
$(NULL)
@@ -60,7 +60,7 @@ nautilus_actions_new_LDADD = \
$(NULL)
nautilus_actions_print_SOURCES = \
- file-manager-actions-print.c \
+ nautilus-actions-print.c \
console-utils.c
\
console-utils.h
\
$(NULL)
@@ -72,14 +72,14 @@ nautilus_actions_print_LDADD = \
BUILT_SOURCES =
BUILT_SOURCES += \
- file-manager-actions-run-bindings.c \
- file-manager-actions-run-bindings.h \
+ nautilus-actions-run-bindings.c \
+ nautilus-actions-run-bindings.h \
$(NULL)
-file-manager-actions-run-bindings.c nautilus-actions-run-bindings.h:
$(top_srcdir)/src/plugin-tracker/na-tracker-gdbus.xml
+nautilus-actions-run-bindings.c nautilus-actions-run-bindings.h:
$(top_srcdir)/src/plugin-tracker/na-tracker-gdbus.xml
gdbus-codegen \
--interface-prefix org.nautilus_actions.DBus.Tracker. \
- --generate-c-code file-manager-actions-run-bindings \
+ --generate-c-code nautilus-actions-run-bindings \
--c-namespace NA_Tracker \
--c-generate-object-manager \
$<
@@ -89,7 +89,7 @@ nodist_nautilus_actions_run_SOURCES = \
$(NULL)
nautilus_actions_run_SOURCES = \
- file-manager-actions-run.c
\
+ nautilus-actions-run.c \
console-utils.c
\
console-utils.h
\
$(NULL)
diff --git a/src/utils/nautilus-actions-run.c b/src/utils/nautilus-actions-run.c
index de9e8c2..c265d37 100644
--- a/src/utils/nautilus-actions-run.c
+++ b/src/utils/nautilus-actions-run.c
@@ -47,7 +47,7 @@
#include <core/na-tokens.h>
#include "console-utils.h"
-#include "file-manager-actions-run-bindings.h"
+#include "nautilus-actions-run-bindings.h"
static gchar *id = "";
static gchar **targets_array = NULL;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
