[nautilus-actions/file-manager-actions] na_core_utils_xxx functions are renamed to fma_core_utils_xxx
- From: Pierre Wieser <pwieser src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus-actions/file-manager-actions] na_core_utils_xxx functions are renamed to fma_core_utils_xxx
- Date: Mon, 7 Sep 2015 22:08:26 +0000 (UTC)
commit 089691c6d5a206bd533c895fefbe4ac60b7b29fc
Author: Pierre Wieser <pwieser trychlos org>
Date: Mon Sep 7 20:34:07 2015 +0200
na_core_utils_xxx functions are renamed to fma_core_utils_xxx
src/api/Makefile.am | 2 +-
src/api/fma-boxed.h | 6 +-
src/api/fma-core-utils.h | 106 +++++++++++++
src/api/na-core-utils.h | 106 -------------
src/core/Makefile.am | 2 +-
src/core/fma-boxed.c | 24 ++--
src/core/{na-core-utils.c => fma-core-utils.c} | 190 ++++++++++++------------
src/core/na-data-boxed.c | 8 +-
src/core/na-data-types.c | 2 +-
src/core/na-factory-object.c | 4 +-
src/core/na-gconf-utils.c | 12 +-
src/core/na-icontext.c | 68 +++++-----
src/core/na-ifactory-object.c | 2 +-
src/core/na-iimporter.c | 14 +-
src/core/na-importer.c | 22 ++--
src/core/na-io-provider.c | 14 +-
src/core/na-ioptions-list.c | 4 +-
src/core/na-iprefs.c | 4 +-
src/core/na-module.c | 4 +-
src/core/na-object-action.c | 4 +-
src/core/na-object-id.c | 4 +-
src/core/na-object-item.c | 12 +-
src/core/na-object-profile.c | 12 +-
src/core/na-pivot.c | 4 +-
src/core/na-settings.c | 12 +-
src/core/na-tokens.c | 30 ++--
src/core/na-updater.c | 4 +-
src/io-desktop/nadp-desktop-file.c | 14 +-
src/io-desktop/nadp-desktop-provider.c | 2 +-
src/io-desktop/nadp-reader.c | 24 ++--
src/io-desktop/nadp-utils.c | 6 +-
src/io-desktop/nadp-writer.c | 26 ++--
src/io-desktop/nadp-xdg-dirs.c | 4 +-
src/io-gconf/nagp-reader.c | 4 +-
src/io-gconf/nagp-writer.c | 4 +-
src/io-xml/naxml-reader.c | 40 +++---
src/io-xml/naxml-writer.c | 10 +-
src/nact/base-builder.c | 8 +-
src/nact/nact-add-capability-dialog.c | 8 +-
src/nact/nact-add-scheme-dialog.c | 6 +-
src/nact/nact-application.c | 4 +-
src/nact/nact-assistant-export.c | 10 +-
src/nact/nact-assistant-import.c | 10 +-
src/nact/nact-iaction-tab.c | 2 +-
src/nact/nact-icapabilities-tab.c | 4 +-
src/nact/nact-icommand-tab.c | 2 +-
src/nact/nact-ienvironment-tab.c | 4 +-
src/nact/nact-ifolders-tab.c | 2 +-
src/nact/nact-ischemes-tab.c | 4 +-
src/nact/nact-match-list.c | 36 +++---
src/nact/nact-menu-edit.c | 10 +-
src/nact/nact-menu-file.c | 14 +-
src/nact/nact-providers-list.c | 4 +-
src/nact/nact-schemes-list.c | 12 +-
src/nact/nact-tree-ieditable.c | 6 +-
src/nact/nact-tree-model-dnd.c | 10 +-
src/plugin-menu/nautilus-actions.c | 6 +-
src/test/test-reader.c | 8 +-
src/utils/na-delete-xmltree.c | 4 +-
src/utils/na-print-schemas.c | 8 +-
src/utils/na-set-conf.c | 6 +-
src/utils/nautilus-actions-new.c | 20 ++--
src/utils/nautilus-actions-print.c | 6 +-
src/utils/nautilus-actions-run.c | 4 +-
64 files changed, 514 insertions(+), 514 deletions(-)
---
diff --git a/src/api/Makefile.am b/src/api/Makefile.am
index 3bfc346..b0ba8b5 100644
--- a/src/api/Makefile.am
+++ b/src/api/Makefile.am
@@ -38,7 +38,7 @@ api_include_HEADERS = \
na-iio-provider.h \
\
fma-boxed.h \
- na-core-utils.h \
+ fma-core-utils.h \
na-data-boxed.h \
na-data-def.h \
na-data-types.h \
diff --git a/src/api/fma-boxed.h b/src/api/fma-boxed.h
index 470a2de..32b438a 100644
--- a/src/api/fma-boxed.h
+++ b/src/api/fma-boxed.h
@@ -27,8 +27,8 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __FILE_MANAGER_ACTIONS_API_FMA_BOXED_H__
-#define __FILE_MANAGER_ACTIONS_API_FMA_BOXED_H__
+#ifndef __FILE_MANAGER_ACTIONS_API_BOXED_H__
+#define __FILE_MANAGER_ACTIONS_API_BOXED_H__
/**
* SECTION: boxed
@@ -95,4 +95,4 @@ void fma_boxed_set_from_void ( FMABoxed *boxed, const void *value );
G_END_DECLS
-#endif /* __FILE_MANAGER_ACTIONS_API_FMA_BOXED_H__ */
+#endif /* __FILE_MANAGER_ACTIONS_API_BOXED_H__ */
diff --git a/src/api/fma-core-utils.h b/src/api/fma-core-utils.h
new file mode 100644
index 0000000..c241662
--- /dev/null
+++ b/src/api/fma-core-utils.h
@@ -0,0 +1,106 @@
+/*
+ * 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_CORE_UTILS_H__
+#define __FILE_MANAGER_ACTIONS_API_CORE_UTILS_H__
+
+/**
+ * SECTION: core-utils
+ * @title: Core Misc
+ * @short_description: The Core Library Utilities
+ * @include: file-manager-actions/fma-core-utils.h
+ */
+
+#include <glib.h>
+
+G_BEGIN_DECLS
+
+/* boolean manipulation
+ */
+gboolean fma_core_utils_boolean_from_string( const gchar *string );
+
+/* string manipulation
+ */
+#ifdef NA_ENABLE_DEPRECATED
+gchar *fma_core_utils_str_add_prefix( const gchar *prefix, const gchar *str );
+#endif
+int fma_core_utils_str_collate( const gchar *str1, const gchar *str2 );
+gchar *fma_core_utils_str_remove_char( const gchar *string, const gchar *to_remove );
+gchar *fma_core_utils_str_remove_suffix( const gchar *string, const gchar *suffix );
+void fma_core_utils_str_split_first_word( const gchar *string, gchar **first, gchar **other );
+gchar *fma_core_utils_str_subst( const gchar *pattern, const gchar *key, const gchar *subst );
+
+/* some functions to get or set GSList list of strings
+ */
+void fma_core_utils_slist_add_message( GSList **list, const gchar *format, ... );
+GSList *fma_core_utils_slist_duplicate( GSList *slist );
+void fma_core_utils_slist_dump( const gchar *prefix, GSList *list );
+GSList *fma_core_utils_slist_from_array( const gchar **str_array );
+GSList *fma_core_utils_slist_from_split( const gchar *text, const gchar *separator );
+gchar *fma_core_utils_slist_join_at_end( GSList *slist, const gchar *link );
+GSList *fma_core_utils_slist_remove_ascii( GSList *slist, const gchar *text );
+GSList *fma_core_utils_slist_remove_utf8( GSList *slist, const gchar *text );
+gchar **fma_core_utils_slist_to_array( GSList *slist );
+gchar *fma_core_utils_slist_to_text( GSList *slist );
+GSList *fma_core_utils_slist_setup_element( GSList *list, const gchar *element, gboolean set );
+guint fma_core_utils_slist_count( GSList *list, const gchar *str );
+gboolean fma_core_utils_slist_find_negated( GSList *list, const gchar *str );
+gboolean fma_core_utils_slist_are_equal( GSList *a, GSList *b );
+void fma_core_utils_slist_free( GSList *slist );
+
+/* some functions for GString manipulations.
+ */
+gchar *fma_core_utils_gstring_joinv( const gchar *start, const gchar *separator, gchar **list );
+
+/* selection count
+ */
+void fma_core_utils_selcount_get_ope_int( const gchar *selection_count, gchar **ope, gchar **uint );
+
+/* directory management
+ */
+gboolean fma_core_utils_dir_is_writable_path( const gchar *path );
+gboolean fma_core_utils_dir_is_writable_uri ( const gchar *uri );
+void fma_core_utils_dir_list_perms ( const gchar *path, const gchar *message );
+void fma_core_utils_dir_split_ext ( const gchar *string, gchar **first, gchar **ext );
+
+/* file management
+ */
+gboolean fma_core_utils_file_delete ( const gchar *path );
+gboolean fma_core_utils_file_exists ( const gchar *uri );
+gboolean fma_core_utils_file_is_loadable ( const gchar *uri );
+void fma_core_utils_file_list_perms ( const gchar *path, const gchar *message );
+gchar *fma_core_utils_file_load_from_uri( const gchar *uri, gsize *length );
+
+/* miscellaneous
+ */
+void fma_core_utils_print_version( void );
+
+G_END_DECLS
+
+#endif /* __FILE_MANAGER_ACTIONS_API_CORE_UTILS_H__ */
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index 2f2a302..5dcf282 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -54,7 +54,7 @@ libna_core_la_SOURCES = \
na-about.c \
na-about.h \
fma-boxed.c \
- na-core-utils.c \
+ fma-core-utils.c \
na-data-boxed.c \
na-data-def.c \
na-data-types.c \
diff --git a/src/core/fma-boxed.c b/src/core/fma-boxed.c
index ddbc51a..6288c1c 100644
--- a/src/core/fma-boxed.c
+++ b/src/core/fma-boxed.c
@@ -36,7 +36,7 @@
#include <api/fma-boxed.h>
#include <api/na-data-types.h>
-#include <api/na-core-utils.h>
+#include <api/fma-core-utils.h>
/* private class data
*/
@@ -701,7 +701,7 @@ fma_boxed_get_string( const FMABoxed *boxed )
* @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.
+ * type, which should be fma_core_utils_slist_free() by the caller, %NULL else.
*
* Since: 3.1
*/
@@ -800,7 +800,7 @@ fma_boxed_get_as_value( const FMABoxed *boxed, GValue *value )
* If of type NA_DATA_TYPE_STRING (resp. NA_DATA_TYPE_LOCALE_STRING,
* NA_DATA_TYPE_STRING_LIST or NA_DATA_TYPE_UINT_LIST), then the content
* is returned in a newly allocated value, which should be g_free() (resp.
- * g_free(), na_core_utils_slist_free(), g_list_free()) by the caller.
+ * g_free(), fma_core_utils_slist_free(), g_list_free()) by the caller.
*
* Since: 3.1
*/
@@ -932,7 +932,7 @@ bool_free( FMABoxed *boxed )
static void
bool_from_string( FMABoxed *boxed, const gchar *string )
{
- boxed->private->u.boolean = na_core_utils_boolean_from_string( string );
+ boxed->private->u.boolean = fma_core_utils_boolean_from_string( string );
}
static void
@@ -1146,14 +1146,14 @@ string_list_copy( FMABoxed *dest, const FMABoxed *src )
if( dest->private->is_set ){
string_list_free( dest );
}
- dest->private->u.string_list = na_core_utils_slist_duplicate( src->private->u.string_list );
+ dest->private->u.string_list = fma_core_utils_slist_duplicate( src->private->u.string_list );
dest->private->is_set = TRUE;
}
static void
string_list_free( FMABoxed *boxed )
{
- na_core_utils_slist_free( boxed->private->u.string_list );
+ fma_core_utils_slist_free( boxed->private->u.string_list );
boxed->private->u.string_list = NULL;
boxed->private->is_set = FALSE;
}
@@ -1174,7 +1174,7 @@ string_list_from_string( FMABoxed *boxed, const gchar *string )
if( array ){
i = ( gchar ** ) array;
while( *i ){
- if( !na_core_utils_slist_count( boxed->private->u.string_list, ( const gchar * )( *i
))){
+ if( !fma_core_utils_slist_count( boxed->private->u.string_list, ( const gchar * )( *i
))){
boxed->private->u.string_list = g_slist_prepend(
boxed->private->u.string_list, g_strdup( *i ));
}
i++;
@@ -1199,7 +1199,7 @@ string_list_from_void( FMABoxed *boxed, const void *value )
value_slist = ( GSList * ) value;
for( it = value_slist ; it ; it = it->next ){
- if( !na_core_utils_slist_count( boxed->private->u.string_list, ( const gchar * ) it->data )){
+ if( !fma_core_utils_slist_count( boxed->private->u.string_list, ( const gchar * ) it->data )){
boxed->private->u.string_list = g_slist_prepend( boxed->private->u.string_list,
g_strdup(( const gchar * ) it->data ));
}
}
@@ -1234,13 +1234,13 @@ string_list_to_string( const FMABoxed *boxed )
static GSList *
string_list_to_string_list( const FMABoxed *boxed )
{
- return( na_core_utils_slist_duplicate( boxed->private->u.string_list ));
+ return( fma_core_utils_slist_duplicate( boxed->private->u.string_list ));
}
static void
string_list_to_value( const FMABoxed *boxed, GValue *value )
{
- g_value_set_pointer( value, na_core_utils_slist_duplicate( boxed->private->u.string_list ));
+ g_value_set_pointer( value, fma_core_utils_slist_duplicate( boxed->private->u.string_list ));
}
static void *
@@ -1249,7 +1249,7 @@ string_list_to_void( const FMABoxed *boxed )
void *value = NULL;
if( boxed->private->u.string_list ){
- value = na_core_utils_slist_duplicate( boxed->private->u.string_list );
+ value = fma_core_utils_slist_duplicate( boxed->private->u.string_list );
}
return( value );
@@ -1264,7 +1264,7 @@ locale_are_equal( const FMABoxed *a, const FMABoxed *b )
if( !a->private->u.string || !b->private->u.string ){
return( FALSE );
}
- return( na_core_utils_str_collate( a->private->u.string, b->private->u.string ) == 0 );
+ return( fma_core_utils_str_collate( a->private->u.string, b->private->u.string ) == 0 );
}
static gboolean
diff --git a/src/core/na-core-utils.c b/src/core/fma-core-utils.c
similarity index 82%
rename from src/core/na-core-utils.c
rename to src/core/fma-core-utils.c
index 1491072..3086168 100644
--- a/src/core/na-core-utils.c
+++ b/src/core/fma-core-utils.c
@@ -38,12 +38,12 @@
#include <gio/gio.h>
#include <glib/gstdio.h>
-#include <api/na-core-utils.h>
+#include <api/fma-core-utils.h>
#include "na-about.h"
/* minimal and maximal size for loading the content of a file in memory
- * used by na_core_utils_file_is_size_ok()
+ * used by fma_core_utils_file_is_size_ok()
*/
#define SIZE_MIN 1
#define SIZE_MAX 1048576 /* 1 MB */
@@ -56,7 +56,7 @@ static gboolean file_is_loadable( GFile *file );
static void list_perms( const gchar *path, const gchar *message, const gchar *command );
/**
- * na_core_utils_boolean_from_string
+ * fma_core_utils_boolean_from_string
* @string: a string to be converted.
*
* Returns: %TRUE if the string evaluates to "true" (case insensitive),
@@ -65,7 +65,7 @@ static void list_perms( const gchar *path, const gchar *message, const gchar
* Since: 2.30
*/
gboolean
-na_core_utils_boolean_from_string( const gchar *string )
+fma_core_utils_boolean_from_string( const gchar *string )
{
if( !string ) return( FALSE );
@@ -74,7 +74,7 @@ na_core_utils_boolean_from_string( const gchar *string )
#ifdef NA_ENABLE_DEPRECATED
/**
- * na_core_utils_str_add_prefix:
+ * fma_core_utils_str_add_prefix:
* @prefix: the prefix to be prepended.
* @str: a multiline string.
*
@@ -86,7 +86,7 @@ na_core_utils_boolean_from_string( const gchar *string )
* Deprecated: 3.2
*/
gchar *
-na_core_utils_str_add_prefix( const gchar *prefix, const gchar *str )
+fma_core_utils_str_add_prefix( const gchar *prefix, const gchar *str )
{
GSList *list, *il;
GString *result;
@@ -98,7 +98,7 @@ na_core_utils_str_add_prefix( const gchar *prefix, const gchar *str )
g_string_append_printf( result, "%s%s\n", prefix, ( gchar * ) il->data );
}
- na_core_utils_slist_free( list );
+ fma_core_utils_slist_free( list );
return( g_string_free( result, FALSE ));
}
@@ -120,7 +120,7 @@ text_to_string_list( const gchar *text, const gchar *separator, const gchar *def
} else {
tokens = g_strsplit( source, separator, -1 );
- strlist = na_core_utils_slist_from_array(( const gchar ** ) tokens );
+ strlist = fma_core_utils_slist_from_array(( const gchar ** ) tokens );
g_strfreev( tokens );
}
@@ -130,7 +130,7 @@ text_to_string_list( const gchar *text, const gchar *separator, const gchar *def
#endif /* NA_ENABLE_DEPRECATED */
/**
- * na_core_utils_str_collate:
+ * fma_core_utils_str_collate:
* @str1: an UTF-8 encoded string.
* @str2: an UTF-8 encoded string.
*
@@ -150,7 +150,7 @@ text_to_string_list( const gchar *text, const gchar *separator, const gchar *def
* Since: 2.30
*/
int
-na_core_utils_str_collate( const gchar *str1, const gchar *str2 )
+fma_core_utils_str_collate( const gchar *str1, const gchar *str2 )
{
int res;
@@ -171,7 +171,7 @@ na_core_utils_str_collate( const gchar *str1, const gchar *str2 )
}
/**
- * na_core_utils_str_remove_char:
+ * fma_core_utils_str_remove_char:
* @string: source string.
* @to_remove: the character to remove.
*
@@ -183,9 +183,9 @@ na_core_utils_str_collate( const gchar *str1, const gchar *str2 )
* Since: 2.30
*/
gchar *
-na_core_utils_str_remove_char( const gchar *string, const gchar *to_remove )
+fma_core_utils_str_remove_char( const gchar *string, const gchar *to_remove )
{
- static const gchar *thisfn = "na_core_utils_str_remove_char";
+ static const gchar *thisfn = "fma_core_utils_str_remove_char";
gchar *removed;
GRegex *regex;
GError *error;
@@ -214,7 +214,7 @@ na_core_utils_str_remove_char( const gchar *string, const gchar *to_remove )
}
/**
- * na_core_utils_str_remove_suffix:
+ * fma_core_utils_str_remove_suffix:
* @string: source string.
* @suffix: suffix to be removed from @string.
*
@@ -227,7 +227,7 @@ na_core_utils_str_remove_char( const gchar *string, const gchar *to_remove )
* Since: 2.30
*/
gchar *
-na_core_utils_str_remove_suffix( const gchar *string, const gchar *suffix )
+fma_core_utils_str_remove_suffix( const gchar *string, const gchar *suffix )
{
gchar *removed;
gchar *ptr;
@@ -243,7 +243,7 @@ na_core_utils_str_remove_suffix( const gchar *string, const gchar *suffix )
}
/**
- * na_core_utils_str_split_first_word:
+ * fma_core_utils_str_split_first_word:
* @string: a space-separated string.
* @first: a pointer to a gchar *.
* @other: a pointer to a gchar *.
@@ -263,7 +263,7 @@ na_core_utils_str_remove_suffix( const gchar *string, const gchar *suffix )
* Since: 2.30
*/
void
-na_core_utils_str_split_first_word( const gchar *string, gchar **first, gchar **other )
+fma_core_utils_str_split_first_word( const gchar *string, gchar **first, gchar **other )
{
gchar **splitted, **iter;
@@ -290,7 +290,7 @@ na_core_utils_str_split_first_word( const gchar *string, gchar **first, gchar **
}
/**
- * na_core_utils_str_subst:
+ * fma_core_utils_str_subst:
* @pattern: the pattern.
* @key: the key string to be substituted.
* @subst: the string which will replace @key.
@@ -302,7 +302,7 @@ na_core_utils_str_split_first_word( const gchar *string, gchar **first, gchar **
* or a copy of @pattern if @key is not found in @pattern.
*/
gchar *
-na_core_utils_str_subst( const gchar *pattern, const gchar *key, const gchar *subst )
+fma_core_utils_str_subst( const gchar *pattern, const gchar *key, const gchar *subst )
{
GString *result;
gchar *found;
@@ -322,7 +322,7 @@ na_core_utils_str_subst( const gchar *pattern, const gchar *key, const gchar *su
}
void
-na_core_utils_slist_add_message( GSList **messages, const gchar *format, ... )
+fma_core_utils_slist_add_message( GSList **messages, const gchar *format, ... )
{
va_list va;
gchar *tmp;
@@ -335,17 +335,17 @@ na_core_utils_slist_add_message( GSList **messages, const gchar *format, ... )
}
/**
- * na_core_utils_slist_duplicate:
+ * fma_core_utils_slist_duplicate:
* @slist: the #GSList to be duplicated.
*
* Returns: a #GSList of strings.
*
- * The returned list should be na_core_utils_slist_free() by the caller.
+ * The returned list should be fma_core_utils_slist_free() by the caller.
*
* Since: 2.30
*/
GSList *
-na_core_utils_slist_duplicate( GSList *slist )
+fma_core_utils_slist_duplicate( GSList *slist )
{
GSList *dest_slist, *it;
@@ -361,7 +361,7 @@ na_core_utils_slist_duplicate( GSList *slist )
}
/**
- * na_core_utils_slist_dump:
+ * fma_core_utils_slist_dump:
* @prefix: a string to be used as a prefix for each outputed line.
* @list: a list of strings.
*
@@ -370,9 +370,9 @@ na_core_utils_slist_duplicate( GSList *slist )
* Since: 2.30
*/
void
-na_core_utils_slist_dump( const gchar *prefix, GSList *list )
+fma_core_utils_slist_dump( const gchar *prefix, GSList *list )
{
- static const gchar *thisfn = "na_core_utils_slist_dump";
+ static const gchar *thisfn = "fma_core_utils_slist_dump";
GSList *i;
int c;
const gchar *thispfx;
@@ -388,18 +388,18 @@ na_core_utils_slist_dump( const gchar *prefix, GSList *list )
}
/**
- * na_core_utils_slist_from_split:
+ * fma_core_utils_slist_from_split:
* @text: a string to be splitted.
* @separator: the string to be used as the separator.
*
* Returns: a #GSList with the list of strings after having been splitted.
*
- * The returned #GSList should be na_core_utils_slist_free() by the caller.
+ * The returned #GSList should be fma_core_utils_slist_free() by the caller.
*
* Since: 2.30
*/
GSList *
-na_core_utils_slist_from_split( const gchar *text, const gchar *separator )
+fma_core_utils_slist_from_split( const gchar *text, const gchar *separator )
{
GSList *slist;
gchar **tokens;
@@ -417,7 +417,7 @@ na_core_utils_slist_from_split( const gchar *text, const gchar *separator )
}
tokens = g_strsplit( tmp, separator, -1 );
- slist = na_core_utils_slist_from_array(( const gchar ** ) tokens );
+ slist = fma_core_utils_slist_from_array(( const gchar ** ) tokens );
g_strfreev( tokens );
g_free( source );
@@ -426,16 +426,16 @@ na_core_utils_slist_from_split( const gchar *text, const gchar *separator )
}
/**
- * na_core_utils_slist_from_array:
+ * fma_core_utils_slist_from_array:
* @str_array: an NULL-terminated array of strings.
*
- * Returns: a #GSList list of strings, which should be #na_core_utils_slist_free()
+ * Returns: a #GSList list of strings, which should be #fma_core_utils_slist_free()
* by the caller.
*
* Since: 2.30
*/
GSList *
-na_core_utils_slist_from_array( const gchar **str_array )
+fma_core_utils_slist_from_array( const gchar **str_array )
{
GSList *slist;
gchar **idx;
@@ -452,7 +452,7 @@ na_core_utils_slist_from_array( const gchar **str_array )
}
/**
- * na_core_utils_slist_join_at_end:
+ * fma_core_utils_slist_join_at_end:
* @slist: the string list to join.
* @link: the string used to join each element.
*
@@ -461,7 +461,7 @@ na_core_utils_slist_from_array( const gchar **str_array )
* Since: 2.30
*/
gchar *
-na_core_utils_slist_join_at_end( GSList *slist, const gchar *link )
+fma_core_utils_slist_join_at_end( GSList *slist, const gchar *link )
{
GSList *is;
GString *str;
@@ -479,7 +479,7 @@ na_core_utils_slist_join_at_end( GSList *slist, const gchar *link )
}
/**
- * na_core_utils_slist_remove_ascii:
+ * fma_core_utils_slist_remove_ascii:
* @slist: the #GSList to be updated.
* @text: string to remove.
*
@@ -490,7 +490,7 @@ na_core_utils_slist_join_at_end( GSList *slist, const gchar *link )
* Since: 2.30
*/
GSList *
-na_core_utils_slist_remove_ascii( GSList *slist, const gchar *text )
+fma_core_utils_slist_remove_ascii( GSList *slist, const gchar *text )
{
GSList *il;
@@ -508,7 +508,7 @@ na_core_utils_slist_remove_ascii( GSList *slist, const gchar *text )
}
/**
- * na_core_utils_slist_remove_utf8:
+ * fma_core_utils_slist_remove_utf8:
* @slist: the #GSList to be updated.
* @text: the string to be removed.
*
@@ -520,13 +520,13 @@ na_core_utils_slist_remove_ascii( GSList *slist, const gchar *text )
* Since: 2.30
*/
GSList *
-na_core_utils_slist_remove_utf8( GSList *slist, const gchar *text )
+fma_core_utils_slist_remove_utf8( GSList *slist, const gchar *text )
{
GSList *is;
for( is = slist ; is ; is = is->next ){
const gchar *istr = ( const gchar * ) is->data;
- if( !na_core_utils_str_collate( text, istr )){
+ if( !fma_core_utils_str_collate( text, istr )){
g_free( is->data );
slist = g_slist_delete_link( slist, is );
break;
@@ -537,7 +537,7 @@ na_core_utils_slist_remove_utf8( GSList *slist, const gchar *text )
}
/**
- * na_core_utils_slist_to_array:
+ * fma_core_utils_slist_to_array:
* @slist: a list of strings.
*
* Returns: a newly allocated array of strings, which should be
@@ -546,7 +546,7 @@ na_core_utils_slist_remove_utf8( GSList *slist, const gchar *text )
* Since: 2.30
*/
gchar **
-na_core_utils_slist_to_array( GSList *slist )
+fma_core_utils_slist_to_array( GSList *slist )
{
GString *str;
GSList *is;
@@ -563,7 +563,7 @@ na_core_utils_slist_to_array( GSList *slist )
}
/**
- * na_core_utils_slist_to_text:
+ * fma_core_utils_slist_to_text:
* @slist: a list of strings.
*
* Concatenates a string list to a semi-colon-separated text
@@ -575,7 +575,7 @@ na_core_utils_slist_to_array( GSList *slist )
* Since: 2.30
*/
gchar *
-na_core_utils_slist_to_text( GSList *slist )
+fma_core_utils_slist_to_text( GSList *slist )
{
GSList *ib;
gchar *tmp;
@@ -596,7 +596,7 @@ na_core_utils_slist_to_text( GSList *slist )
}
/**
- * na_core_utils_slist_setup_element:
+ * fma_core_utils_slist_setup_element:
* @list: the GSList of strings to be setup.
* @element: the string to add to or remove of the list.
* @set: whether the @element should be set or removed.
@@ -609,24 +609,24 @@ na_core_utils_slist_to_text( GSList *slist )
* Since: 2.30
*/
GSList *
-na_core_utils_slist_setup_element( GSList *list, const gchar *element, gboolean set )
+fma_core_utils_slist_setup_element( GSList *list, const gchar *element, gboolean set )
{
guint count;
- count = na_core_utils_slist_count( list, element );
+ count = fma_core_utils_slist_count( list, element );
if( set && count == 0 ){
list = g_slist_prepend( list, g_strdup( element ));
}
if( !set && count > 0 ){
- list = na_core_utils_slist_remove_ascii( list, element );
+ list = fma_core_utils_slist_remove_ascii( list, element );
}
return( list );
}
/**
- * na_core_utils_slist_count:
+ * fma_core_utils_slist_count:
* @list: the GSList of strings to be searched.
* @str: the searched string.
*
@@ -637,7 +637,7 @@ na_core_utils_slist_setup_element( GSList *list, const gchar *element, gboolean
* Since: 2.30
*/
guint
-na_core_utils_slist_count( GSList *list, const gchar *str )
+fma_core_utils_slist_count( GSList *list, const gchar *str )
{
guint count;
GSList *il;
@@ -646,7 +646,7 @@ na_core_utils_slist_count( GSList *list, const gchar *str )
for( il = list ; il ; il = il->next ){
const gchar *istr = ( const gchar * ) il->data;
- if( !na_core_utils_str_collate( str, istr )){
+ if( !fma_core_utils_str_collate( str, istr )){
count += 1;
}
}
@@ -655,7 +655,7 @@ na_core_utils_slist_count( GSList *list, const gchar *str )
}
/**
- * na_core_utils_slist_find_negated:
+ * fma_core_utils_slist_find_negated:
* @list: the GSList of strings to be searched.
* @str: the searched string.
*
@@ -666,7 +666,7 @@ na_core_utils_slist_count( GSList *list, const gchar *str )
* Since: 2.30
*/
gboolean
-na_core_utils_slist_find_negated( GSList *list, const gchar *str )
+fma_core_utils_slist_find_negated( GSList *list, const gchar *str )
{
GSList *il;
@@ -675,13 +675,13 @@ na_core_utils_slist_find_negated( GSList *list, const gchar *str )
if( istr[0] == '!' ){
gchar *istrdup = g_strdup( istr+1 );
- int match = na_core_utils_str_collate( str, istrdup );
+ int match = fma_core_utils_str_collate( str, istrdup );
g_free( istrdup );
if( match == 0 ){
return( TRUE );
}
- } else if( na_core_utils_str_collate( str, istr ) == 0 ){
+ } else if( fma_core_utils_str_collate( str, istr ) == 0 ){
return( TRUE );
}
}
@@ -690,7 +690,7 @@ na_core_utils_slist_find_negated( GSList *list, const gchar *str )
}
/**
- * na_core_utils_slist_are_equal:
+ * fma_core_utils_slist_are_equal:
* @a: a GSList of strings.
* @b: another GSList of strings to be compared with @first.
*
@@ -701,20 +701,20 @@ na_core_utils_slist_find_negated( GSList *list, const gchar *str )
* Since: 2.30
*/
gboolean
-na_core_utils_slist_are_equal( GSList *a, GSList *b )
+fma_core_utils_slist_are_equal( GSList *a, GSList *b )
{
GSList *il;
for( il = a ; il ; il = il->next ){
const gchar *str = ( const gchar * ) il->data;
- if( na_core_utils_slist_count( b, str ) == 0 ){
+ if( fma_core_utils_slist_count( b, str ) == 0 ){
return( FALSE );
}
}
for( il = b ; il ; il = il->next ){
const gchar *str = ( const gchar * ) il->data;
- if( na_core_utils_slist_count( a, str ) == 0 ){
+ if( fma_core_utils_slist_count( a, str ) == 0 ){
return( FALSE );
}
}
@@ -723,7 +723,7 @@ na_core_utils_slist_are_equal( GSList *a, GSList *b )
}
/**
- * na_core_utils_slist_free:
+ * fma_core_utils_slist_free:
* @slist: a #GSList list of strings.
*
* Releases the strings and the list itself.
@@ -731,14 +731,14 @@ na_core_utils_slist_are_equal( GSList *a, GSList *b )
* Since: 2.30
*/
void
-na_core_utils_slist_free( GSList *slist )
+fma_core_utils_slist_free( GSList *slist )
{
g_slist_foreach( slist, ( GFunc ) g_free, NULL );
g_slist_free( slist );
}
/**
- * na_core_utils_gstring_joinv:
+ * fma_core_utils_gstring_joinv:
* @start: a prefix to be written at the beginning of the output string.
* @separator: a string to be used as separator.
* @list: the list of strings to be concatenated.
@@ -750,7 +750,7 @@ na_core_utils_slist_free( GSList *slist )
* Since: 2.30
*/
gchar *
-na_core_utils_gstring_joinv( const gchar *start, const gchar *separator, gchar **list )
+fma_core_utils_gstring_joinv( const gchar *start, const gchar *separator, gchar **list )
{
GString *tmp_string = g_string_new( "" );
int i;
@@ -776,7 +776,7 @@ na_core_utils_gstring_joinv( const gchar *start, const gchar *separator, gchar *
}
/***
- * na_core_utils_selcount_get_ope:
+ * fma_core_utils_selcount_get_ope:
* @selcount: the selection count condition string.
* @ope: a pointer to a newly allocated string which will contains the
* operation code.
@@ -791,7 +791,7 @@ na_core_utils_gstring_joinv( const gchar *start, const gchar *separator, gchar *
* Since: 2.30
*/
void
-na_core_utils_selcount_get_ope_int( const gchar *selcount, gchar **ope, gchar **uint )
+fma_core_utils_selcount_get_ope_int( const gchar *selcount, gchar **ope, gchar **uint )
{
gchar *dup, *dup2;
guint uint_int;
@@ -814,7 +814,7 @@ na_core_utils_selcount_get_ope_int( const gchar *selcount, gchar **ope, gchar **
}
/**
- * na_core_utils_dir_is_writable_path:
+ * fma_core_utils_dir_is_writable_path:
* @path: the path of the directory to be tested.
*
* Returns: %TRUE if the directory is writable, %FALSE else.
@@ -828,9 +828,9 @@ na_core_utils_selcount_get_ope_int( const gchar *selcount, gchar **ope, gchar **
* Since: 2.30
*/
gboolean
-na_core_utils_dir_is_writable_path( const gchar *path )
+fma_core_utils_dir_is_writable_path( const gchar *path )
{
- static const gchar *thisfn = "na_core_utils_path_is_writable";
+ static const gchar *thisfn = "fma_core_utils_path_is_writable";
GFile *file;
gboolean writable;
@@ -847,7 +847,7 @@ na_core_utils_dir_is_writable_path( const gchar *path )
}
/**
- * na_core_utils_dir_is_writable_uri:
+ * fma_core_utils_dir_is_writable_uri:
* @uri: the URI of the directory to be tested.
*
* Returns: %TRUE if the directory is writable, %FALSE else.
@@ -861,9 +861,9 @@ na_core_utils_dir_is_writable_path( const gchar *path )
* Since: 2.30
*/
gboolean
-na_core_utils_dir_is_writable_uri( const gchar *uri )
+fma_core_utils_dir_is_writable_uri( const gchar *uri )
{
- static const gchar *thisfn = "na_core_utils_dir_is_writable_uri";
+ static const gchar *thisfn = "fma_core_utils_dir_is_writable_uri";
GFile *file;
gboolean writable;
@@ -882,7 +882,7 @@ na_core_utils_dir_is_writable_uri( const gchar *uri )
static gboolean
info_dir_is_writable( GFile *file, const gchar *path_or_uri )
{
- static const gchar *thisfn = "na_core_utils_info_dir_is_writable";
+ static const gchar *thisfn = "fma_core_utils_info_dir_is_writable";
GError *error = NULL;
GFileInfo *info;
GFileType type;
@@ -918,7 +918,7 @@ info_dir_is_writable( GFile *file, const gchar *path_or_uri )
}
/**
- * na_core_utils_dir_list_perms:
+ * fma_core_utils_dir_list_perms:
* @path: the path of the directory to be tested.
* @message: a message to be printed if not %NULL.
*
@@ -927,13 +927,13 @@ info_dir_is_writable( GFile *file, const gchar *path_or_uri )
* Since: 3.1
*/
void
-na_core_utils_dir_list_perms( const gchar *path, const gchar *message )
+fma_core_utils_dir_list_perms( const gchar *path, const gchar *message )
{
list_perms( path, message, "ls -ld" );
}
/**
- * na_core_utils_dir_split_ext:
+ * fma_core_utils_dir_split_ext:
* @string: the input path or URI to be splitted.
* @first: a pointer to a buffer which will contain the first part of the split.
* @ext: a pointer to a buffer which will contain the extension part of the path.
@@ -946,7 +946,7 @@ na_core_utils_dir_list_perms( const gchar *path, const gchar *message )
* Since: 2.30
*/
void
-na_core_utils_dir_split_ext( const gchar *string, gchar **first, gchar **ext )
+fma_core_utils_dir_split_ext( const gchar *string, gchar **first, gchar **ext )
{
gchar *dupped;
gchar **array, **iter;
@@ -977,7 +977,7 @@ na_core_utils_dir_split_ext( const gchar *string, gchar **first, gchar **ext )
}
/**
- * na_core_utils_file_delete:
+ * fma_core_utils_file_delete:
* @path: the path of the file to be deleted.
*
* Returns: %TRUE if the file is successfully deleted, %FALSE else.
@@ -985,9 +985,9 @@ na_core_utils_dir_split_ext( const gchar *string, gchar **first, gchar **ext )
* Since: 2.30
*/
gboolean
-na_core_utils_file_delete( const gchar *path )
+fma_core_utils_file_delete( const gchar *path )
{
- static const gchar *thisfn = "na_core_utils_file_delete";
+ static const gchar *thisfn = "fma_core_utils_file_delete";
gboolean deleted = FALSE;
if( !path || !g_utf8_strlen( path, -1 )){
@@ -1005,18 +1005,18 @@ na_core_utils_file_delete( const gchar *path )
}
/**
- * na_core_utils_file_exists:
+ * fma_core_utils_file_exists:
* @uri: a file URI.
*
* Returns: %TRUE if the specified file exists, %FALSE else.
*
- * Race condition: cf. na_core_utils_dir_is_writable_path() and
- * na_core_utils_dir_is_writable_uri() comments.
+ * Race condition: cf. fma_core_utils_dir_is_writable_path() and
+ * fma_core_utils_dir_is_writable_uri() comments.
*
* Since: 2.30
*/
gboolean
-na_core_utils_file_exists( const gchar *uri )
+fma_core_utils_file_exists( const gchar *uri )
{
GFile *file;
gboolean exists;
@@ -1029,7 +1029,7 @@ na_core_utils_file_exists( const gchar *uri )
}
/**
- * na_core_utils_file_is_loadable:
+ * fma_core_utils_file_is_loadable:
* @uri: the URI to be checked.
*
* Checks that the file is suitable to be loaded in memory, because
@@ -1042,9 +1042,9 @@ na_core_utils_file_exists( const gchar *uri )
* Since: 3.1
*/
gboolean
-na_core_utils_file_is_loadable( const gchar *uri )
+fma_core_utils_file_is_loadable( const gchar *uri )
{
- static const gchar *thisfn = "na_core_utils_file_is_loadable";
+ static const gchar *thisfn = "fma_core_utils_file_is_loadable";
GFile *file;
gboolean isok;
@@ -1063,7 +1063,7 @@ na_core_utils_file_is_loadable( const gchar *uri )
static gboolean
file_is_loadable( GFile *file )
{
- static const gchar *thisfn = "na_core_utils_file_is_loadable";
+ static const gchar *thisfn = "fma_core_utils_file_is_loadable";
GError *error;
GFileInfo *info;
guint64 size;
@@ -1115,7 +1115,7 @@ file_is_loadable( GFile *file )
}
/**
- * na_core_utils_file_list_perms:
+ * fma_core_utils_file_list_perms:
* @path: the path of the file to be tested.
* @message: a message to be printed if not %NULL.
*
@@ -1124,7 +1124,7 @@ file_is_loadable( GFile *file )
* Since: 3.2
*/
void
-na_core_utils_file_list_perms( const gchar *path, const gchar *message )
+fma_core_utils_file_list_perms( const gchar *path, const gchar *message )
{
list_perms( path, message, "ls -l" );
}
@@ -1132,7 +1132,7 @@ na_core_utils_file_list_perms( const gchar *path, const gchar *message )
static void
list_perms( const gchar *path, const gchar *message, const gchar *command )
{
- static const gchar *thisfn = "na_core_utils_list_perms";
+ static const gchar *thisfn = "fma_core_utils_list_perms";
gchar *cmd;
gchar *out, *err;
GError *error;
@@ -1155,7 +1155,7 @@ list_perms( const gchar *path, const gchar *message, const gchar *command )
}
/**
- * na_core_utils_file_load_from_uri:
+ * fma_core_utils_file_load_from_uri:
* @uri: the URI the file must be loaded from.
* @length: a pointer to the length of the read content.
*
@@ -1168,9 +1168,9 @@ list_perms( const gchar *path, const gchar *message, const gchar *command )
* Since: 2.30
*/
gchar *
-na_core_utils_file_load_from_uri( const gchar *uri, gsize *length )
+fma_core_utils_file_load_from_uri( const gchar *uri, gsize *length )
{
- static const gchar *thisfn = "na_core_utils_file_load_from_uri";
+ static const gchar *thisfn = "fma_core_utils_file_load_from_uri";
gchar *data;
GFile *file;
GError *error;
@@ -1203,7 +1203,7 @@ na_core_utils_file_load_from_uri( const gchar *uri, gsize *length )
}
/**
- * na_core_utils_print_version:
+ * fma_core_utils_print_version:
*
* Print a version message on the console
*
@@ -1217,7 +1217,7 @@ na_core_utils_file_load_from_uri( const gchar *uri, gsize *length )
* Since: 2.30
*/
void
-na_core_utils_print_version( void )
+fma_core_utils_print_version( void )
{
gchar *copyright;
diff --git a/src/core/na-data-boxed.c b/src/core/na-data-boxed.c
index 6246add..7d9a19c 100644
--- a/src/core/na-data-boxed.c
+++ b/src/core/na-data-boxed.c
@@ -35,7 +35,7 @@
#include <stdlib.h>
#include <string.h>
-#include <api/na-core-utils.h>
+#include <api/fma-core-utils.h>
#include <api/na-gconf-utils.h>
#include <api/na-data-def.h>
#include <api/na-data-types.h>
@@ -582,7 +582,7 @@ bool_spec( const NADataDef *def )
def->name,
gettext( def->short_label ),
gettext( def->long_label ),
- na_core_utils_boolean_from_string( def->default_value ),
+ fma_core_utils_boolean_from_string( def->default_value ),
G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE ));
}
@@ -593,7 +593,7 @@ bool_is_default( const NADataBoxed *boxed )
gboolean default_value;
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 );
+ default_value = fma_core_utils_boolean_from_string( boxed->private->data_def->default_value );
is_default = ( default_value == fma_boxed_get_boolean( FMA_BOXED( boxed )));
}
@@ -758,7 +758,7 @@ locale_is_default( const NADataBoxed *boxed )
if( boxed->private->data_def->default_value && g_utf8_strlen(
boxed->private->data_def->default_value, -1 )){
if( value && strlen( value )){
/* default value is not null and string has something */
- is_default = ( na_core_utils_str_collate( value,
boxed->private->data_def->default_value ) == 0 );
+ is_default = ( fma_core_utils_str_collate( value,
boxed->private->data_def->default_value ) == 0 );
} else {
/* default value is not null, but string is null */
diff --git a/src/core/na-data-types.c b/src/core/na-data-types.c
index ebbd5fa..379bfd9 100644
--- a/src/core/na-data-types.c
+++ b/src/core/na-data-types.c
@@ -32,7 +32,7 @@
#endif
#include <api/na-data-types.h>
-#include <api/na-core-utils.h>
+#include <api/fma-core-utils.h>
typedef struct {
guint type;
diff --git a/src/core/na-factory-object.c b/src/core/na-factory-object.c
index bb60357..2f9a203 100644
--- a/src/core/na-factory-object.c
+++ b/src/core/na-factory-object.c
@@ -35,7 +35,7 @@
#include <stdlib.h>
#include <string.h>
-#include <api/na-core-utils.h>
+#include <api/fma-core-utils.h>
#include <api/na-data-boxed.h>
#include <api/na-data-types.h>
#include <api/na-iio-provider.h>
@@ -756,7 +756,7 @@ na_factory_object_get_as_value( const NAIFactoryObject *object, const gchar *nam
*
* If the type of the value is NA_DATA_TYPE_STRING or NA_DATA_TYPE_LOCALE_STRING
* (resp. NA_DATA_TYPE_STRING_LIST), then the returned value is a newly allocated
- * string (resp. GSList) and should be g_free() (resp. na_core_utils_slist_free())
+ * string (resp. GSList) and should be g_free() (resp. fma_core_utils_slist_free())
* by the caller.
*/
void *
diff --git a/src/core/na-gconf-utils.c b/src/core/na-gconf-utils.c
index 963f5b8..19ba2ab 100644
--- a/src/core/na-gconf-utils.c
+++ b/src/core/na-gconf-utils.c
@@ -35,7 +35,7 @@
#include <string.h>
-#include <api/na-core-utils.h>
+#include <api/fma-core-utils.h>
#include <api/na-gconf-utils.h>
static void dump_entry( GConfEntry *entry, void *user_data );
@@ -85,7 +85,7 @@ na_gconf_utils_get_subdirs( GConfClient *gconf, const gchar *path )
void
na_gconf_utils_free_subdirs( GSList *subdirs )
{
- na_core_utils_slist_free( subdirs );
+ fma_core_utils_slist_free( subdirs );
}
/**
@@ -255,7 +255,7 @@ na_gconf_utils_get_string_from_entries( GSList *entries, const gchar *entry, gch
* If the entry was not found, or was not of string list type, @value
* is set to %NULL.
*
- * If @value is returned not NULL, it should be na_core_utils_slist_free()
+ * If @value is returned not NULL, it should be fma_core_utils_slist_free()
* by the caller.
*
* Since: 2.30
@@ -502,7 +502,7 @@ na_gconf_utils_read_string( GConfClient *gconf, const gchar *path, gboolean use_
* Returns: a list of strings,
* or %NULL if the entry was not found or was not of string list type.
*
- * The returned list must be released with na_core_utils_slist_free().
+ * The returned list must be released with fma_core_utils_slist_free().
*
* Since: 2.30
*/
@@ -730,7 +730,7 @@ na_gconf_utils_remove_entry( GConfClient *gconf, const gchar *path, gchar **mess
* to a list of strings.
*
* Returns: a newly allocated list of strings, which should be
- * na_core_utils_slist_free() by the caller, or %NULL if the provided
+ * fma_core_utils_slist_free() by the caller, or %NULL if the provided
* string was not of the GConf form.
*
* Since: 2.30
@@ -757,7 +757,7 @@ na_gconf_utils_slist_from_string( const gchar *value )
tmp_string += 1;
tmp_string[strlen(tmp_string)-1] = '\0';
- slist = na_core_utils_slist_from_split( tmp_string, "," );
+ slist = fma_core_utils_slist_from_split( tmp_string, "," );
return( slist );
}
diff --git a/src/core/na-icontext.c b/src/core/na-icontext.c
index cafe0ee..ff885de 100644
--- a/src/core/na-icontext.c
+++ b/src/core/na-icontext.c
@@ -47,7 +47,7 @@
#include <libnautilus-extension/nautilus-file-info.h>
-#include <api/na-core-utils.h>
+#include <api/fma-core-utils.h>
#include <api/na-object-api.h>
#include "na-desktop-environment.h"
@@ -318,7 +318,7 @@ na_icontext_check_mimetypes( const NAIContext *context )
na_object_set_all_mimetypes( context, is_all );
- na_core_utils_slist_free( mimetypes );
+ fma_core_utils_slist_free( mimetypes );
}
/**
@@ -377,9 +377,9 @@ na_icontext_set_scheme( NAIContext *context, const gchar *scheme, gboolean selec
g_return_if_fail( NA_IS_ICONTEXT( context ));
schemes = na_object_get_schemes( context );
- schemes = na_core_utils_slist_setup_element( schemes, scheme, selected );
+ schemes = fma_core_utils_slist_setup_element( schemes, scheme, selected );
na_object_set_schemes( context, schemes );
- na_core_utils_slist_free( schemes );
+ fma_core_utils_slist_free( schemes );
}
/**
@@ -400,9 +400,9 @@ na_icontext_set_only_desktop( NAIContext *context, const gchar *desktop, gboolea
g_return_if_fail( NA_IS_ICONTEXT( context ));
desktops = na_object_get_only_show_in( context );
- desktops = na_core_utils_slist_setup_element( desktops, desktop, selected );
+ desktops = fma_core_utils_slist_setup_element( desktops, desktop, selected );
na_object_set_only_show_in( context, desktops );
- na_core_utils_slist_free( desktops );
+ fma_core_utils_slist_free( desktops );
}
/**
@@ -423,9 +423,9 @@ na_icontext_set_not_desktop( NAIContext *context, const gchar *desktop, gboolean
g_return_if_fail( NA_IS_ICONTEXT( context ));
desktops = na_object_get_not_show_in( context );
- desktops = na_core_utils_slist_setup_element( desktops, desktop, selected );
+ desktops = fma_core_utils_slist_setup_element( desktops, desktop, selected );
na_object_set_not_show_in( context, desktops );
- na_core_utils_slist_free( desktops );
+ fma_core_utils_slist_free( desktops );
}
/**
@@ -446,10 +446,10 @@ na_icontext_replace_folder( NAIContext *context, const gchar *old, const gchar *
g_return_if_fail( NA_IS_ICONTEXT( context ));
folders = na_object_get_folders( context );
- folders = na_core_utils_slist_remove_utf8( folders, old );
+ folders = fma_core_utils_slist_remove_utf8( folders, old );
folders = g_slist_append( folders, ( gpointer ) g_strdup( new ));
na_object_set_folders( context, folders );
- na_core_utils_slist_free( folders );
+ fma_core_utils_slist_free( folders );
}
static gboolean
@@ -535,21 +535,21 @@ is_candidate_for_show_in( const NAIContext *object, guint target, GList *files )
}
if( only_in && g_slist_length( only_in )){
- ok = ( na_core_utils_slist_count( only_in, environment ) > 0 );
+ ok = ( fma_core_utils_slist_count( only_in, environment ) > 0 );
} else if( not_in && g_slist_length( not_in )){
- ok = ( na_core_utils_slist_count( not_in, environment ) == 0 );
+ ok = ( fma_core_utils_slist_count( not_in, environment ) == 0 );
}
if( !ok ){
- gchar *only_str = na_core_utils_slist_to_text( only_in );
- gchar *not_str = na_core_utils_slist_to_text( not_in );
+ gchar *only_str = fma_core_utils_slist_to_text( only_in );
+ gchar *not_str = fma_core_utils_slist_to_text( not_in );
g_debug( "%s: object is not candidate because OnlyShowIn=%s, NotShowIn=%s", thisfn, only_str,
not_str );
g_free( not_str );
g_free( only_str );
}
- na_core_utils_slist_free( not_in );
- na_core_utils_slist_free( only_in );
+ fma_core_utils_slist_free( not_in );
+ fma_core_utils_slist_free( only_in );
return( ok );
}
@@ -761,7 +761,7 @@ is_candidate_for_mimetypes( const NAIContext *object, guint target, GList *files
}
if( !match ){
- gchar *mimetypes_str = na_core_utils_slist_to_text( mimetypes );
+ gchar *mimetypes_str = fma_core_utils_slist_to_text( mimetypes );
g_debug( "%s: no positive match found for Mimetypes=%s", thisfn,
mimetypes_str );
g_free( mimetypes_str );
ok = FALSE;
@@ -777,7 +777,7 @@ is_candidate_for_mimetypes( const NAIContext *object, guint target, GList *files
g_free( ftype );
}
- na_core_utils_slist_free( mimetypes );
+ fma_core_utils_slist_free( mimetypes );
}
return( ok );
@@ -896,7 +896,7 @@ is_candidate_for_basenames( const NAIContext *object, guint target, GList *files
}
if( !match ){
- gchar *basenames_str = na_core_utils_slist_to_text( basenames );
+ gchar *basenames_str = fma_core_utils_slist_to_text( basenames );
g_debug( "%s: no positive match found for Basenames=%s", thisfn,
basenames_str );
g_free( basenames_str );
ok = FALSE;
@@ -907,7 +907,7 @@ is_candidate_for_basenames( const NAIContext *object, guint target, GList *files
}
}
- na_core_utils_slist_free( basenames );
+ fma_core_utils_slist_free( basenames );
}
return( ok );
@@ -976,7 +976,7 @@ is_candidate_for_schemes( const NAIContext *object, guint target, GList *files )
for( it = files ; it && ok ; it = it->next ){
gchar *scheme = na_selected_info_get_uri_scheme( NA_SELECTED_INFO( it->data
));
- if( na_core_utils_slist_count( distincts, scheme ) == 0 ){
+ if( fma_core_utils_slist_count( distincts, scheme ) == 0 ){
GSList *is;
gchar *pattern;
gboolean match, positive;
@@ -1005,16 +1005,16 @@ is_candidate_for_schemes( const NAIContext *object, guint target, GList *files )
g_free( scheme );
}
- na_core_utils_slist_free( distincts );
+ fma_core_utils_slist_free( distincts );
}
if( !ok ){
- gchar *schemes_str = na_core_utils_slist_to_text( schemes );
+ gchar *schemes_str = fma_core_utils_slist_to_text( schemes );
g_debug( "%s: object is not candidate because Schemes=%s", thisfn, schemes_str );
g_free( schemes_str );
}
- na_core_utils_slist_free( schemes );
+ fma_core_utils_slist_free( schemes );
}
g_debug( "%s: ok=%s", thisfn, ok ? "True":"False" );
@@ -1059,7 +1059,7 @@ is_candidate_for_folders( const NAIContext *object, guint target, GList *files )
for( it = files ; it && ok ; it = it->next ){
gchar *dirname = na_selected_info_get_dirname( NA_SELECTED_INFO( it->data ));
- if( na_core_utils_slist_count( distincts, dirname ) == 0 ){
+ if( fma_core_utils_slist_count( distincts, dirname ) == 0 ){
g_debug( "%s: examining new distinct selected dirname=%s", thisfn,
dirname );
GSList *id;
@@ -1092,16 +1092,16 @@ is_candidate_for_folders( const NAIContext *object, guint target, GList *files )
g_free( dirname );
}
- na_core_utils_slist_free( distincts );
+ fma_core_utils_slist_free( distincts );
}
if( !ok ){
- gchar *folders_str = na_core_utils_slist_to_text( folders );
+ gchar *folders_str = fma_core_utils_slist_to_text( folders );
g_debug( "%s: object is not candidate because Folders=%s", thisfn, folders_str );
g_free( folders_str );
}
- na_core_utils_slist_free( folders );
+ fma_core_utils_slist_free( folders );
}
return( ok );
@@ -1150,12 +1150,12 @@ is_candidate_for_capabilities( const NAIContext *object, guint target, GList *fi
}
if( !ok ){
- gchar *capabilities_str = na_core_utils_slist_to_text( capabilities );
+ gchar *capabilities_str = fma_core_utils_slist_to_text( capabilities );
g_debug( "%s: object is not candidate because Capabilities=%s", thisfn,
capabilities_str );
g_free( capabilities_str );
}
- na_core_utils_slist_free( capabilities );
+ fma_core_utils_slist_free( capabilities );
}
return( ok );
@@ -1169,7 +1169,7 @@ is_valid_basenames( const NAIContext *object )
basenames = na_object_get_basenames( object );
valid = basenames && g_slist_length( basenames ) > 0;
- na_core_utils_slist_free( basenames );
+ fma_core_utils_slist_free( basenames );
if( !valid ){
na_object_debug_invalid( object, "basenames" );
@@ -1229,7 +1229,7 @@ is_valid_mimetypes( const NAIContext *object )
na_object_debug_invalid( object, "mimetypes" );
}
- na_core_utils_slist_free( mimetypes );
+ fma_core_utils_slist_free( mimetypes );
return( valid );
}
@@ -1242,7 +1242,7 @@ is_valid_schemes( const NAIContext *object )
schemes = na_object_get_schemes( object );
valid = schemes && g_slist_length( schemes ) > 0;
- na_core_utils_slist_free( schemes );
+ fma_core_utils_slist_free( schemes );
if( !valid ){
na_object_debug_invalid( object, "schemes" );
@@ -1259,7 +1259,7 @@ is_valid_folders( const NAIContext *object )
folders = na_object_get_folders( object );
valid = folders && g_slist_length( folders ) > 0;
- na_core_utils_slist_free( folders );
+ fma_core_utils_slist_free( folders );
if( !valid ){
na_object_debug_invalid( object, "folders" );
diff --git a/src/core/na-ifactory-object.c b/src/core/na-ifactory-object.c
index 919129a..e2cb8a5 100644
--- a/src/core/na-ifactory-object.c
+++ b/src/core/na-ifactory-object.c
@@ -208,7 +208,7 @@ na_ifactory_object_get_data_groups( const NAIFactoryObject *object )
*
* If the type of the value is %NA_DATA_TYPE_STRING, %NA_DATA_TYPE_LOCALE_STRING,
* or %NA_DATA_TYPE_STRING_LIST, then the returned value is a newly allocated
- * one and should be g_free() (resp. na_core_utils_slist_free()) by the
+ * one and should be g_free() (resp. fma_core_utils_slist_free()) by the
* caller.
*
* Returns: the searched value.
diff --git a/src/core/na-iimporter.c b/src/core/na-iimporter.c
index 72619a6..3c6a53e 100644
--- a/src/core/na-iimporter.c
+++ b/src/core/na-iimporter.c
@@ -33,7 +33,7 @@
#include <glib/gi18n.h>
-#include <api/na-core-utils.h>
+#include <api/fma-core-utils.h>
#include <api/na-iimporter.h>
#include <api/na-object-api.h>
@@ -236,7 +236,7 @@ na_iimporter_manage_import_mode( NAIImporterManageImportModeParms *parms )
} else {
renumber_label_item( parms );
- na_core_utils_slist_add_message( &parms->messages, "%s", _( "Item was renumbered because the
caller did not provide any check function." ));
+ fma_core_utils_slist_add_message( &parms->messages, "%s", _( "Item was renumbered because the
caller did not provide any check function." ));
parms->import_mode = IMPORTER_MODE_RENUMBER;
}
@@ -251,7 +251,7 @@ na_iimporter_manage_import_mode( NAIImporterManageImportModeParms *parms )
} else {
renumber_label_item( parms );
- na_core_utils_slist_add_message( &parms->messages, "%s", _( "Item was
renumbered because the caller did not provide any ask user function." ));
+ fma_core_utils_slist_add_message( &parms->messages, "%s", _( "Item was
renumbered because the caller did not provide any ask user function." ));
parms->import_mode = IMPORTER_MODE_RENUMBER;
}
@@ -270,22 +270,22 @@ na_iimporter_manage_import_mode( NAIImporterManageImportModeParms *parms )
case IMPORTER_MODE_RENUMBER:
renumber_label_item( parms );
if( parms->asked_mode == IMPORTER_MODE_ASK ){
- na_core_utils_slist_add_message( &parms->messages, "%s", _( "Item was
renumbered due to user request." ));
+ fma_core_utils_slist_add_message( &parms->messages, "%s", _( "Item
was renumbered due to user request." ));
}
break;
case IMPORTER_MODE_OVERRIDE:
if( parms->asked_mode == IMPORTER_MODE_ASK ){
- na_core_utils_slist_add_message( &parms->messages, "%s", _( "Existing
item was overriden due to user request." ));
+ fma_core_utils_slist_add_message( &parms->messages, "%s", _(
"Existing item was overriden due to user request." ));
}
break;
case IMPORTER_MODE_NO_IMPORT:
default:
id = na_object_get_id( parms->imported );
- na_core_utils_slist_add_message( &parms->messages, _( "Item %s already
exists." ), id );
+ fma_core_utils_slist_add_message( &parms->messages, _( "Item %s already
exists." ), id );
if( parms->asked_mode == IMPORTER_MODE_ASK ){
- na_core_utils_slist_add_message( &parms->messages, "%s", _( "Import
was canceled due to user request." ));
+ fma_core_utils_slist_add_message( &parms->messages, "%s", _( "Import
was canceled due to user request." ));
}
g_free( id );
code = IMPORTER_CODE_CANCELLED;
diff --git a/src/core/na-importer.c b/src/core/na-importer.c
index 797015e..536be96 100644
--- a/src/core/na-importer.c
+++ b/src/core/na-importer.c
@@ -34,7 +34,7 @@
#include <glib/gi18n.h>
#include <string.h>
-#include <api/na-core-utils.h>
+#include <api/fma-core-utils.h>
#include <api/na-iimporter.h>
#include <api/na-object-api.h>
@@ -197,7 +197,7 @@ void
na_importer_free_result( NAImporterResult *result )
{
g_free( result->uri );
- na_core_utils_slist_free( result->messages );
+ fma_core_utils_slist_free( result->messages );
g_free( result );
}
@@ -243,14 +243,14 @@ import_from_uri( const NAPivot *pivot, GList *modules, const gchar *uri )
provider_parms.messages = NULL;
} else if( code == IMPORTER_CODE_NOT_LOADABLE ){
- na_core_utils_slist_free( all_messages );
+ fma_core_utils_slist_free( all_messages );
all_messages = NULL;
- na_core_utils_slist_free( provider_parms.messages );
+ fma_core_utils_slist_free( provider_parms.messages );
provider_parms.messages = NULL;
- na_core_utils_slist_add_message( &all_messages, ERR_NOT_LOADABLE, ( const gchar * )
uri );
+ fma_core_utils_slist_add_message( &all_messages, ERR_NOT_LOADABLE, ( const gchar * )
uri );
} else {
- na_core_utils_slist_free( all_messages );
+ fma_core_utils_slist_free( all_messages );
all_messages = provider_parms.messages;
provider = NA_IIMPORTER( im->data );
}
@@ -287,7 +287,7 @@ manage_import_mode( NAImporterParms *parms, GList *results, NAImporterAskUserPar
*/
if( !parms->check_fn ){
renumber_label_item( result->imported );
- na_core_utils_slist_add_message(
+ fma_core_utils_slist_add_message(
&result->messages,
"%s",
_( "Item was renumbered because the caller did not provide any check
function." ));
@@ -320,7 +320,7 @@ manage_import_mode( NAImporterParms *parms, GList *results, NAImporterAskUserPar
case IMPORTER_MODE_RENUMBER:
renumber_label_item( result->imported );
if( parms->preferred_mode == IMPORTER_MODE_ASK ){
- na_core_utils_slist_add_message(
+ fma_core_utils_slist_add_message(
&result->messages,
"%s",
_( "Item was renumbered due to user request." ));
@@ -329,7 +329,7 @@ manage_import_mode( NAImporterParms *parms, GList *results, NAImporterAskUserPar
case IMPORTER_MODE_OVERRIDE:
if( parms->preferred_mode == IMPORTER_MODE_ASK ){
- na_core_utils_slist_add_message(
+ fma_core_utils_slist_add_message(
&result->messages,
"%s",
_( "Existing item was overriden due to user request."
));
@@ -339,12 +339,12 @@ manage_import_mode( NAImporterParms *parms, GList *results, NAImporterAskUserPar
case IMPORTER_MODE_NO_IMPORT:
default:
id = na_object_get_id( result->imported );
- na_core_utils_slist_add_message(
+ fma_core_utils_slist_add_message(
&result->messages,
_( "Item %s already exists." ),
id );
if( parms->preferred_mode == IMPORTER_MODE_ASK ){
- na_core_utils_slist_add_message(
+ fma_core_utils_slist_add_message(
&result->messages,
"%s",
_( "Import was canceled due to user request." ));
diff --git a/src/core/na-io-provider.c b/src/core/na-io-provider.c
index bc8a2e0..ffb75f1 100644
--- a/src/core/na-io-provider.c
+++ b/src/core/na-io-provider.c
@@ -36,7 +36,7 @@
#include <api/na-iio-provider.h>
#include <api/na-object-api.h>
-#include <api/na-core-utils.h>
+#include <api/fma-core-utils.h>
#include "na-iprefs.h"
#include "na-io-provider.h"
@@ -421,7 +421,7 @@ io_providers_list_add_from_write_order( const NAPivot *pivot, GList *objects_lis
merged = io_providers_list_append_object( pivot, merged, NULL, id );
}
- na_core_utils_slist_free( io_providers );
+ fma_core_utils_slist_free( io_providers );
return( merged );
}
@@ -490,7 +490,7 @@ io_providers_list_add_from_prefs( const NAPivot *pivot, GList *objects_list )
merged = io_providers_list_append_object( pivot, merged, NULL, id );
}
- na_core_utils_slist_free( io_providers );
+ fma_core_utils_slist_free( io_providers );
return( merged );
}
@@ -506,7 +506,7 @@ io_providers_list_add_from_prefs( const NAPivot *pivot, GList *objects_list )
* to be unique, nor sorted.
*
* Returns: a list of i/o provider identifiers found in preferences
- * system; this list should be na_core_utils_slist_free() by the caller.
+ * system; this list should be fma_core_utils_slist_free() by the caller.
*
* Since: 3.1
*/
@@ -533,7 +533,7 @@ io_providers_get_from_prefs( void )
}
g_free( group_prefix );
- na_core_utils_slist_free( groups );
+ fma_core_utils_slist_free( groups );
return( providers );
}
@@ -885,7 +885,7 @@ na_io_provider_load_items( const NAPivot *pivot, guint loadable_set, GSList **me
}
}
- na_core_utils_slist_free( level_zero );
+ fma_core_utils_slist_free( level_zero );
/* sort the hierarchy according to preferences
*/
@@ -1168,7 +1168,7 @@ load_items_hierarchy_build( GList **tree, GSList *level_zero, gboolean list_if_e
subitems_ids = na_object_get_items_slist( it->data );
subitems = load_items_hierarchy_build( tree, subitems_ids, FALSE,
NA_OBJECT_ITEM( it->data ));
na_object_set_items( it->data, subitems );
- na_core_utils_slist_free( subitems_ids );
+ fma_core_utils_slist_free( subitems_ids );
}
}
}
diff --git a/src/core/na-ioptions-list.c b/src/core/na-ioptions-list.c
index 62ba458..f6dfdfc 100644
--- a/src/core/na-ioptions-list.c
+++ b/src/core/na-ioptions-list.c
@@ -33,7 +33,7 @@
#include <string.h>
-#include <api/na-core-utils.h>
+#include <api/fma-core-utils.h>
#include "na-gtk-utils.h"
#include "na-ioptions-list.h"
@@ -682,7 +682,7 @@ tree_view_add_item( GtkTreeView *listview, GtkTreeModel *model, const NAIOption
GdkPixbuf *pixbuf;
label = na_ioption_get_label( option );
- label2 = na_core_utils_str_remove_char( label, "_" );
+ label2 = fma_core_utils_str_remove_char( label, "_" );
description = na_ioption_get_description( option );
pixbuf = na_ioption_get_pixbuf( option );
gtk_list_store_append( GTK_LIST_STORE( model ), &iter );
diff --git a/src/core/na-iprefs.c b/src/core/na-iprefs.c
index ab1275f..f4cc478 100644
--- a/src/core/na-iprefs.c
+++ b/src/core/na-iprefs.c
@@ -33,7 +33,7 @@
#include <string.h>
-#include <api/na-core-utils.h>
+#include <api/fma-core-utils.h>
#include "na-importer.h"
#include "na-iprefs.h"
@@ -199,7 +199,7 @@ na_iprefs_write_level_zero( const GList *items, GSList **messages )
written = na_settings_set_string_list( NA_IPREFS_ITEMS_LEVEL_ZERO_ORDER, content );
- na_core_utils_slist_free( content );
+ fma_core_utils_slist_free( content );
return( written );
}
diff --git a/src/core/na-module.c b/src/core/na-module.c
index a7d78cd..b25538f 100644
--- a/src/core/na-module.c
+++ b/src/core/na-module.c
@@ -33,7 +33,7 @@
#include <gmodule.h>
-#include <api/na-core-utils.h>
+#include <api/fma-core-utils.h>
#include "na-module.h"
@@ -260,7 +260,7 @@ na_module_load_modules( void )
fname = g_build_filename( dirname, entry, NULL );
module = module_new( fname );
if( module ){
- module->private->name = na_core_utils_str_remove_suffix( entry,
suffix );
+ module->private->name = fma_core_utils_str_remove_suffix( entry,
suffix );
modules = g_list_prepend( modules, module );
g_debug( "%s: module %s successfully loaded", thisfn, entry );
}
diff --git a/src/core/na-object-action.c b/src/core/na-object-action.c
index 98265ce..e42f946 100644
--- a/src/core/na-object-action.c
+++ b/src/core/na-object-action.c
@@ -36,7 +36,7 @@
#include <string.h>
#include <stdlib.h>
-#include <api/na-core-utils.h>
+#include <api/fma-core-utils.h>
#include <api/na-iio-provider.h>
#include <api/na-object-api.h>
@@ -518,7 +518,7 @@ read_done_deals_with_toolbar_label( NAIFactoryObject *instance )
na_object_set_toolbar_same_label( instance, TRUE );
} else {
- same_label = ( na_core_utils_str_collate( action_label, toolbar_label ) == 0 );
+ same_label = ( fma_core_utils_str_collate( action_label, toolbar_label ) == 0 );
na_object_set_toolbar_same_label( instance, same_label );
}
diff --git a/src/core/na-object-id.c b/src/core/na-object-id.c
index e99d671..01868bd 100644
--- a/src/core/na-object-id.c
+++ b/src/core/na-object-id.c
@@ -33,7 +33,7 @@
#include <glib/gi18n.h>
-#include <api/na-core-utils.h>
+#include <api/fma-core-utils.h>
#include <api/na-object-api.h>
/* private class data
@@ -207,7 +207,7 @@ na_object_id_sort_alpha_asc( const NAObjectId *a, const NAObjectId *b )
label_a = na_object_get_label( a );
label_b = na_object_get_label( b );
- compare = na_core_utils_str_collate( label_a, label_b );
+ compare = fma_core_utils_str_collate( label_a, label_b );
g_free( label_b );
g_free( label_a );
diff --git a/src/core/na-object-item.c b/src/core/na-object-item.c
index e9cf53d..a6a0062 100644
--- a/src/core/na-object-item.c
+++ b/src/core/na-object-item.c
@@ -35,7 +35,7 @@
#include <string.h>
#include <uuid/uuid.h>
-#include <api/na-core-utils.h>
+#include <api/fma-core-utils.h>
#include <api/na-object-api.h>
#include "na-io-provider.h"
@@ -304,12 +304,12 @@ object_are_equal( const NAObject *a, const NAObject *b )
g_debug( "%s: a=%p, b=%p", thisfn, ( void * ) a, ( void * ) b );
a_slist = get_children_slist( origin );
- a_list = na_core_utils_slist_join_at_end( a_slist, ";" );
- na_core_utils_slist_free( a_slist );
+ a_list = fma_core_utils_slist_join_at_end( a_slist, ";" );
+ fma_core_utils_slist_free( a_slist );
b_slist = get_children_slist( duplicate );
- b_list = na_core_utils_slist_join_at_end( b_slist, ";" );
- na_core_utils_slist_free( b_slist );
+ b_list = fma_core_utils_slist_join_at_end( b_slist, ";" );
+ fma_core_utils_slist_free( b_slist );
are_equal = ( strcmp( a_list, b_list ) == 0 );
@@ -815,7 +815,7 @@ na_object_item_rebuild_children_slist( NAObjectItem *item )
slist = get_children_slist( item );
na_object_set_items_slist( item, slist );
- na_core_utils_slist_free( slist );
+ fma_core_utils_slist_free( slist );
}
}
diff --git a/src/core/na-object-profile.c b/src/core/na-object-profile.c
index 65bebd3..e6df942 100644
--- a/src/core/na-object-profile.c
+++ b/src/core/na-object-profile.c
@@ -36,7 +36,7 @@
#include <libnautilus-extension/nautilus-file-info.h>
-#include <api/na-core-utils.h>
+#include <api/fma-core-utils.h>
#include <api/na-iio-provider.h>
#include <api/na-ifactory-object.h>
#include <api/na-object-api.h>
@@ -619,15 +619,15 @@ convert_pre_v3_isfiledir( NAObjectProfile *profile )
if( converted ){
na_object_set_mimetypes( profile, mimetypes );
- before_str = na_core_utils_slist_join_at_end( before_list, ";" );
- after_str = na_core_utils_slist_join_at_end( mimetypes, ";" );
+ before_str = fma_core_utils_slist_join_at_end( before_list, ";" );
+ after_str = fma_core_utils_slist_join_at_end( mimetypes, ";" );
g_debug( "%s; mimetypes=[%s] changed to [%s]", thisfn, before_str, after_str );
g_free( after_str );
g_free( before_str );
}
- na_core_utils_slist_free( mimetypes );
- na_core_utils_slist_free( before_list );
+ fma_core_utils_slist_free( mimetypes );
+ fma_core_utils_slist_free( before_list );
}
return( converted );
@@ -668,7 +668,7 @@ split_path_parameters( NAObjectProfile *profile )
g_free( parameters );
g_free( path );
- na_core_utils_str_split_first_word( exec, &path, ¶meters );
+ fma_core_utils_str_split_first_word( exec, &path, ¶meters );
g_free( exec );
na_object_set_path( profile, path );
diff --git a/src/core/na-pivot.c b/src/core/na-pivot.c
index c89362f..2dba6f1 100644
--- a/src/core/na-pivot.c
+++ b/src/core/na-pivot.c
@@ -33,7 +33,7 @@
#include <string.h>
-#include <api/na-core-utils.h>
+#include <api/fma-core-utils.h>
#include <api/na-timeout.h>
#include "na-io-provider.h"
@@ -576,7 +576,7 @@ na_pivot_load_items( NAPivot *pivot )
g_warning( "%s: %s", thisfn, ( const gchar * ) im->data );
}
- na_core_utils_slist_free( messages );
+ fma_core_utils_slist_free( messages );
}
}
diff --git a/src/core/na-settings.c b/src/core/na-settings.c
index 68ea994..d76cbab 100644
--- a/src/core/na-settings.c
+++ b/src/core/na-settings.c
@@ -38,7 +38,7 @@
#include "api/fma-boxed.h"
#include "api/na-data-types.h"
-#include "api/na-core-utils.h"
+#include "api/fma-core-utils.h"
#include "api/na-timeout.h"
#include "na-settings.h"
@@ -615,7 +615,7 @@ na_settings_get_string( const gchar *key, gboolean *found, gboolean *mandatory )
* is otherwise undefined (and rather unpredictable).
*
* Returns: the value of the key as a newly allocated list of strings.
- * The returned list should be na_core_utils_slist_free() by the caller.
+ * The returned list should be fma_core_utils_slist_free() by the caller.
*
* Since: 3.1
*/
@@ -936,7 +936,7 @@ na_settings_set_uint_list( const gchar *key, const GList *value )
* na_settings_get_groups:
*
* Returns: the list of groups in the configuration; this list should be
- * na_core_utils_slist_free() by the caller.
+ * fma_core_utils_slist_free() by the caller.
*
* This function participates to a rather bad hack to obtain the list of
* known i/o providers from preferences. We do not care of returning unique
@@ -955,13 +955,13 @@ na_settings_get_groups( void )
array = g_key_file_get_groups( st_settings->private->mandatory->key_file, NULL );
if( array ){
- groups = na_core_utils_slist_from_array(( const gchar ** ) array );
+ groups = fma_core_utils_slist_from_array(( const gchar ** ) array );
g_strfreev( array );
}
array = g_key_file_get_groups( st_settings->private->user->key_file, NULL );
if( array ){
- groups = g_slist_concat( groups, na_core_utils_slist_from_array(( const gchar ** ) array ));
+ groups = g_slist_concat( groups, fma_core_utils_slist_from_array(( const gchar ** ) array ));
g_strfreev( array );
}
@@ -1133,7 +1133,7 @@ key_file_new( const gchar *dir )
keyfile->key_file = g_key_file_new();
keyfile->fname = g_strdup_printf( "%s/%s.conf", dir, PACKAGE );
- na_core_utils_file_list_perms( keyfile->fname, thisfn );
+ fma_core_utils_file_list_perms( keyfile->fname, thisfn );
error = NULL;
file = g_file_new_for_path( keyfile->fname );
diff --git a/src/core/na-tokens.c b/src/core/na-tokens.c
index 393548a..ab58b52 100644
--- a/src/core/na-tokens.c
+++ b/src/core/na-tokens.c
@@ -36,7 +36,7 @@
#include <gtk/gtk.h>
#include <string.h>
-#include <api/na-core-utils.h>
+#include <api/fma-core-utils.h>
#include <api/na-object-api.h>
#include "na-gnome-vfs-uri.h"
@@ -220,13 +220,13 @@ instance_finalize( GObject *object )
g_free( self->private->scheme );
g_free( self->private->username );
g_free( self->private->hostname );
- na_core_utils_slist_free( self->private->mimetypes );
- na_core_utils_slist_free( self->private->exts );
- na_core_utils_slist_free( self->private->basenames_woext );
- na_core_utils_slist_free( self->private->basenames );
- na_core_utils_slist_free( self->private->basedirs );
- na_core_utils_slist_free( self->private->filenames );
- na_core_utils_slist_free( self->private->uris );
+ fma_core_utils_slist_free( self->private->mimetypes );
+ fma_core_utils_slist_free( self->private->exts );
+ fma_core_utils_slist_free( self->private->basenames_woext );
+ fma_core_utils_slist_free( self->private->basenames );
+ fma_core_utils_slist_free( self->private->basedirs );
+ fma_core_utils_slist_free( self->private->filenames );
+ fma_core_utils_slist_free( self->private->uris );
g_free( self->private );
@@ -278,7 +278,7 @@ na_tokens_new_for_example( void )
tokens->private->basedirs = g_slist_append( tokens->private->basedirs, dirname );
bname = g_path_get_basename( vfs->path );
tokens->private->basenames = g_slist_append( tokens->private->basenames, bname );
- na_core_utils_dir_split_ext( bname, &bname_woext, &ext );
+ fma_core_utils_dir_split_ext( bname, &bname_woext, &ext );
tokens->private->basenames_woext = g_slist_append( tokens->private->basenames_woext,
bname_woext );
tokens->private->exts = g_slist_append( tokens->private->exts, ext );
@@ -329,7 +329,7 @@ na_tokens_new_from_selection( GList *selection )
filename = na_selected_info_get_path( NA_SELECTED_INFO( it->data ));
basedir = na_selected_info_get_dirname( NA_SELECTED_INFO( it->data ));
basename = na_selected_info_get_basename( NA_SELECTED_INFO( it->data ));
- na_core_utils_dir_split_ext( basename, &bname_woext, &ext );
+ fma_core_utils_dir_split_ext( basename, &bname_woext, &ext );
if( first ){
tokens->private->hostname = na_selected_info_get_uri_host( NA_SELECTED_INFO( it->data
));
@@ -646,7 +646,7 @@ na_tokens_command_for_terminal( const gchar *pattern, const gchar *command )
if( pattern && strlen( pattern )){
quoted = g_shell_quote( command );
- run_command = na_core_utils_str_subst( pattern, "COMMAND", quoted );
+ run_command = fma_core_utils_str_subst( pattern, "COMMAND", quoted );
g_free( quoted );
} else {
@@ -733,7 +733,7 @@ is_singular_exec( const NATokens *tokens, const gchar *exec )
* commands are executed one time for each element of the selection
*
* Returns: a #GSList which contains two fields: the command and its parameters.
- * The returned #GSList should be na_core_utils_slist_free() by the caller.
+ * The returned #GSList should be fma_core_utils_slist_free() by the caller.
*/
static gchar *
parse_singular( const NATokens *tokens, const gchar *input, guint i, gboolean utf8, gboolean quoted )
@@ -959,11 +959,11 @@ quote_string_list( GString *input, GSList *names, gboolean quoted )
for( it = names ; it ; it = it->next ){
quoted_names = g_slist_append( quoted_names, g_shell_quote(( const gchar * ) it->data
));
}
- tmp = na_core_utils_slist_join_at_end( quoted_names, " " );
- na_core_utils_slist_free( quoted_names );
+ tmp = fma_core_utils_slist_join_at_end( quoted_names, " " );
+ fma_core_utils_slist_free( quoted_names );
} else {
- tmp = na_core_utils_slist_join_at_end( g_slist_reverse( names ), " " );
+ tmp = fma_core_utils_slist_join_at_end( g_slist_reverse( names ), " " );
}
input = g_string_append( input, tmp );
diff --git a/src/core/na-updater.c b/src/core/na-updater.c
index 7ebcab2..18f64e5 100644
--- a/src/core/na-updater.c
+++ b/src/core/na-updater.c
@@ -31,7 +31,7 @@
#include <config.h>
#endif
-#include <api/na-core-utils.h>
+#include <api/fma-core-utils.h>
#include <api/na-gconf-utils.h>
#include <api/na-object-api.h>
@@ -224,7 +224,7 @@ is_level_zero_writable( const NAUpdater *updater )
level_zero = na_settings_get_string_list( NA_IPREFS_ITEMS_LEVEL_ZERO_ORDER, NULL, &mandatory );
- na_core_utils_slist_free( level_zero );
+ fma_core_utils_slist_free( level_zero );
g_debug( "na_updater_is_level_zero_writable: NA_IPREFS_ITEMS_LEVEL_ZERO_ORDER: mandatory=%s",
mandatory ? "True":"False" );
diff --git a/src/io-desktop/nadp-desktop-file.c b/src/io-desktop/nadp-desktop-file.c
index 2de0051..187bb52 100644
--- a/src/io-desktop/nadp-desktop-file.c
+++ b/src/io-desktop/nadp-desktop-file.c
@@ -35,7 +35,7 @@
#include <gio/gio.h>
-#include <api/na-core-utils.h>
+#include <api/fma-core-utils.h>
#include "nadp-desktop-file.h"
#include "nadp-keys.h"
@@ -284,7 +284,7 @@ nadp_desktop_file_new_from_uri( const gchar *uri )
g_debug( "%s: uri=%s", thisfn, uri );
g_return_val_if_fail( uri && g_utf8_strlen( uri, -1 ), ndf );
- data = na_core_utils_file_load_from_uri( uri, &length );
+ data = fma_core_utils_file_load_from_uri( uri, &length );
g_debug( "%s: length=%lu", thisfn, ( unsigned long ) length );
/* normally, length and data should be both NULL or both not NULL
@@ -419,7 +419,7 @@ path2id( const gchar *path )
gchar *id;
bname = g_path_get_basename( path );
- id = na_core_utils_str_remove_suffix( bname, NADP_DESKTOP_FILE_SUFFIX );
+ id = fma_core_utils_str_remove_suffix( bname, NADP_DESKTOP_FILE_SUFFIX );
g_free( bname );
return( id );
@@ -578,7 +578,7 @@ nadp_desktop_file_get_id( const NadpDesktopFile *ndf )
* @ndf: the #NadpDesktopFile instance.
*
* Returns: the list of profiles in the file, as a newly allocated GSList
- * which must be na_core_utils_slist_free() by the caller.
+ * which must be fma_core_utils_slist_free() by the caller.
*
* Silently ignore unknown groups.
*/
@@ -900,8 +900,8 @@ nadp_desktop_file_get_string_list( const NadpDesktopFile *ndf, const gchar *grou
g_error_free( error );
} else {
- na_core_utils_slist_free( value );
- value = na_core_utils_slist_from_array(( const gchar ** ) read_array );
+ fma_core_utils_slist_free( value );
+ value = fma_core_utils_slist_from_array(( const gchar ** ) read_array );
*key_found = TRUE;
}
@@ -1111,7 +1111,7 @@ nadp_desktop_file_set_string_list( const NadpDesktopFile *ndf, const gchar *grou
if( !ndf->private->dispose_has_run ){
- array = na_core_utils_slist_to_array( value );
+ array = fma_core_utils_slist_to_array( value );
g_key_file_set_string_list( ndf->private->key_file, group, key, ( const gchar * const * )
array, g_slist_length( value ));
g_strfreev( array );
}
diff --git a/src/io-desktop/nadp-desktop-provider.c b/src/io-desktop/nadp-desktop-provider.c
index 1772671..514d634 100644
--- a/src/io-desktop/nadp-desktop-provider.c
+++ b/src/io-desktop/nadp-desktop-provider.c
@@ -34,7 +34,7 @@
#include <glib/gi18n.h>
#include <string.h>
-#include <api/na-core-utils.h>
+#include <api/fma-core-utils.h>
#include <api/na-ifactory-provider.h>
#include "nadp-desktop-provider.h"
diff --git a/src/io-desktop/nadp-reader.c b/src/io-desktop/nadp-reader.c
index 0b8d202..0dc0a37 100644
--- a/src/io-desktop/nadp-reader.c
+++ b/src/io-desktop/nadp-reader.c
@@ -35,7 +35,7 @@
#include <stdlib.h>
#include <string.h>
-#include <api/na-core-utils.h>
+#include <api/fma-core-utils.h>
#include <api/na-data-types.h>
#include <api/na-ifactory-object-data.h>
#include <api/na-ifactory-provider.h>
@@ -137,7 +137,7 @@ get_list_of_desktop_paths( NadpDesktopProvider *provider, GSList **messages )
files = NULL;
xdg_dirs = nadp_xdg_dirs_get_data_dirs();
- subdirs = na_core_utils_slist_from_split( NADP_DESKTOP_PROVIDER_SUBDIRS, G_SEARCHPATH_SEPARATOR_S );
+ subdirs = fma_core_utils_slist_from_split( NADP_DESKTOP_PROVIDER_SUBDIRS, G_SEARCHPATH_SEPARATOR_S );
/* explore each directory from XDG_DATA_DIRS
*/
@@ -154,8 +154,8 @@ get_list_of_desktop_paths( NadpDesktopProvider *provider, GSList **messages )
}
}
- na_core_utils_slist_free( subdirs );
- na_core_utils_slist_free( xdg_dirs );
+ fma_core_utils_slist_free( subdirs );
+ fma_core_utils_slist_free( xdg_dirs );
return( files );
}
@@ -195,7 +195,7 @@ get_list_of_desktop_files( const NadpDesktopProvider *provider, GList **files, c
if( dir_handle ){
while(( name = g_dir_read_name( dir_handle ))){
if( g_str_has_suffix( name, NADP_DESKTOP_FILE_SUFFIX )){
- desktop_id = na_core_utils_str_remove_suffix( name, NADP_DESKTOP_FILE_SUFFIX
);
+ desktop_id = fma_core_utils_str_remove_suffix( name, NADP_DESKTOP_FILE_SUFFIX
);
if( !is_already_loaded( provider, *files, desktop_id )){
*files = desktop_path_from_id( provider, *files, dir, desktop_id );
}
@@ -289,7 +289,7 @@ item_from_desktop_file( const NadpDesktopProvider *provider, NadpDesktopFile *nd
} else {
/* i18n: 'type' is the nature of the item: Action or Menu */
- na_core_utils_slist_add_message( messages, _( "unknown type: %s" ), type );
+ fma_core_utils_slist_add_message( messages, _( "unknown type: %s" ), type );
}
if( item ){
@@ -375,7 +375,7 @@ nadp_reader_iimporter_import_from_uri( const NAIImporter *instance, void *parms_
parms = ( NAIImporterImportFromUriParmsv2 * ) parms_ptr;
- if( !na_core_utils_file_is_loadable( parms->uri )){
+ if( !fma_core_utils_file_is_loadable( parms->uri )){
code = IMPORTER_CODE_NOT_LOADABLE;
return( code );
}
@@ -407,7 +407,7 @@ nadp_reader_iimporter_import_from_uri( const NAIImporter *instance, void *parms_
}
if( code == IMPORTER_CODE_NOT_WILLING_TO ){
- na_core_utils_slist_add_message( &parms->messages, ERR_NOT_DESKTOP );
+ fma_core_utils_slist_add_message( &parms->messages, ERR_NOT_DESKTOP );
}
return( code );
@@ -463,7 +463,7 @@ read_start_read_subitems_key( const NAIFactoryProvider *provider, NAObjectItem *
na_object_set_items_slist( item, subitems );
}
- na_core_utils_slist_free( subitems );
+ fma_core_utils_slist_free( subitems );
}
static void
@@ -540,7 +540,7 @@ nadp_reader_ifactory_provider_read_data( const NAIFactoryProvider *reader, void
break;
case NA_DATA_TYPE_BOOLEAN:
- bool_value = nadp_desktop_file_get_boolean( nrd->ndf, group,
def->desktop_entry, &found, na_core_utils_boolean_from_string( def->default_value ));
+ bool_value = nadp_desktop_file_get_boolean( nrd->ndf, group,
def->desktop_entry, &found, fma_core_utils_boolean_from_string( def->default_value ));
if( found ){
boxed = na_data_boxed_new( def );
fma_boxed_set_from_void( FMA_BOXED( boxed ),
GUINT_TO_POINTER( bool_value ));
@@ -553,7 +553,7 @@ nadp_reader_ifactory_provider_read_data( const NAIFactoryProvider *reader, void
boxed = na_data_boxed_new( def );
fma_boxed_set_from_void( FMA_BOXED( boxed ), slist_value );
}
- na_core_utils_slist_free( slist_value );
+ fma_core_utils_slist_free( slist_value );
break;
case NA_DATA_TYPE_UINT:
@@ -656,7 +656,7 @@ read_done_action_read_profiles( const NAIFactoryProvider *provider, NAObjectActi
}
}
- na_core_utils_slist_free( order );
+ fma_core_utils_slist_free( order );
if( !na_object_get_items_count( action )){
g_warning( "%s: no profile found in .desktop file", thisfn );
diff --git a/src/io-desktop/nadp-utils.c b/src/io-desktop/nadp-utils.c
index 841d5c7..5d6c90a 100644
--- a/src/io-desktop/nadp-utils.c
+++ b/src/io-desktop/nadp-utils.c
@@ -36,7 +36,7 @@
#include <glib/gstdio.h>
#include <string.h>
-#include <api/na-core-utils.h>
+#include <api/fma-core-utils.h>
#include "nadp-desktop-provider.h"
#include "nadp-utils.h"
@@ -55,7 +55,7 @@ nadp_utils_gslist_remove_from( GSList *list, const gchar *string )
for( is = list ; is ; is = is->next ){
const gchar *istr = ( const gchar * ) is->data;
- if( !na_core_utils_str_collate( string, istr )){
+ if( !fma_core_utils_str_collate( string, istr )){
g_free( is->data );
list = g_slist_delete_link( list, is );
break;
@@ -82,7 +82,7 @@ nadp_utils_uri_delete( const gchar *uri )
path = g_filename_from_uri( uri, NULL, NULL );
if( path ){
- deleted = na_core_utils_file_delete( path );
+ deleted = fma_core_utils_file_delete( path );
g_free( path );
}
}
diff --git a/src/io-desktop/nadp-writer.c b/src/io-desktop/nadp-writer.c
index 2993e67..cf68fdd 100644
--- a/src/io-desktop/nadp-writer.c
+++ b/src/io-desktop/nadp-writer.c
@@ -34,7 +34,7 @@
#include <errno.h>
#include <string.h>
-#include <api/na-core-utils.h>
+#include <api/fma-core-utils.h>
#include <api/na-data-types.h>
#include <api/na-object-api.h>
#include <api/na-ifactory-provider.h>
@@ -105,14 +105,14 @@ nadp_iio_provider_is_able_to_write( const NAIIOProvider *provider )
userdir = nadp_xdg_dirs_get_user_data_dir();
if( g_file_test( userdir, G_FILE_TEST_IS_DIR )){
- able_to = na_core_utils_dir_is_writable_path( userdir );
+ able_to = fma_core_utils_dir_is_writable_path( userdir );
} else if( g_mkdir_with_parents( userdir, 0750 )){
g_warning( "%s: %s: %s", thisfn, userdir, g_strerror( errno ));
} else {
- na_core_utils_dir_list_perms( userdir, thisfn );
- able_to = na_core_utils_dir_is_writable_path( userdir );
+ fma_core_utils_dir_list_perms( userdir, thisfn );
+ able_to = fma_core_utils_dir_is_writable_path( userdir );
}
g_free( userdir );
@@ -155,7 +155,7 @@ nadp_iio_provider_write_item( const NAIIOProvider *provider, const NAObjectItem
} else {
userdir = nadp_xdg_dirs_get_user_data_dir();
- subdirs = na_core_utils_slist_from_split( NADP_DESKTOP_PROVIDER_SUBDIRS,
G_SEARCHPATH_SEPARATOR_S );
+ subdirs = fma_core_utils_slist_from_split( NADP_DESKTOP_PROVIDER_SUBDIRS,
G_SEARCHPATH_SEPARATOR_S );
fulldir = g_build_filename( userdir, ( gchar * ) subdirs->data, NULL );
dir_ok = TRUE;
@@ -164,11 +164,11 @@ nadp_iio_provider_write_item( const NAIIOProvider *provider, const NAObjectItem
g_warning( "%s: %s: %s", thisfn, userdir, g_strerror( errno ));
dir_ok = FALSE;
} else {
- na_core_utils_dir_list_perms( userdir, thisfn );
+ fma_core_utils_dir_list_perms( userdir, thisfn );
}
}
g_free( userdir );
- na_core_utils_slist_free( subdirs );
+ fma_core_utils_slist_free( subdirs );
if( dir_ok ){
id = na_object_get_id( item );
@@ -565,7 +565,7 @@ nadp_writer_ifactory_provider_write_data(
case NA_DATA_TYPE_STRING_LIST:
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 );
+ fma_core_utils_slist_free( slist_value );
break;
case NA_DATA_TYPE_UINT:
@@ -609,7 +609,7 @@ write_done_write_subitems_list( NadpDesktopFile *ndp, NAObjectItem *item )
subitems = na_object_get_items_slist( item );
tmp = g_strdup_printf( "%s (written subitems)", thisfn );
- na_core_utils_slist_dump( tmp, subitems );
+ fma_core_utils_slist_dump( tmp, subitems );
g_free( tmp );
nadp_desktop_file_set_string_list(
@@ -620,18 +620,18 @@ write_done_write_subitems_list( NadpDesktopFile *ndp, NAObjectItem *item )
profile_groups = nadp_desktop_file_get_profiles( ndp );
tmp = g_strdup_printf( "%s (existing profiles)", thisfn );
- na_core_utils_slist_dump( tmp, profile_groups );
+ fma_core_utils_slist_dump( tmp, profile_groups );
g_free( tmp );
for( ip = profile_groups ; ip ; ip = ip->next ){
- if( na_core_utils_slist_count( subitems, ( const gchar * ) ip->data ) == 0 ){
+ if( fma_core_utils_slist_count( subitems, ( const gchar * ) ip->data ) == 0 ){
g_debug( "%s: deleting (removed) profile %s", thisfn, ( const gchar * ) ip->data );
nadp_desktop_file_remove_profile( ndp, ( const gchar * ) ip->data );
}
}
- na_core_utils_slist_free( profile_groups );
- na_core_utils_slist_free( subitems );
+ fma_core_utils_slist_free( profile_groups );
+ fma_core_utils_slist_free( subitems );
}
static ExportFormatFn *
diff --git a/src/io-desktop/nadp-xdg-dirs.c b/src/io-desktop/nadp-xdg-dirs.c
index 0434074..2fce0e2 100644
--- a/src/io-desktop/nadp-xdg-dirs.c
+++ b/src/io-desktop/nadp-xdg-dirs.c
@@ -31,7 +31,7 @@
#include <config.h>
#endif
-#include <api/na-core-utils.h>
+#include <api/fma-core-utils.h>
#include "nadp-xdg-dirs.h"
@@ -106,7 +106,7 @@ nadp_xdg_dirs_get_system_data_dirs( void )
dirs = ( const gchar ** ) g_get_system_data_dirs();
- paths = na_core_utils_slist_from_array( dirs );
+ paths = fma_core_utils_slist_from_array( dirs );
return( paths );
}
diff --git a/src/io-gconf/nagp-reader.c b/src/io-gconf/nagp-reader.c
index 9446a29..cc37d71 100644
--- a/src/io-gconf/nagp-reader.c
+++ b/src/io-gconf/nagp-reader.c
@@ -38,7 +38,7 @@
#include <api/na-ifactory-provider.h>
#include <api/na-iio-provider.h>
#include <api/na-object-api.h>
-#include <api/na-core-utils.h>
+#include <api/fma-core-utils.h>
#include <api/na-gconf-utils.h>
#include "nagp-gconf-provider.h"
@@ -391,7 +391,7 @@ get_boxed_from_path( const NagpGConfProvider *provider, const gchar *path, Reade
case NA_DATA_TYPE_STRING_LIST:
slist_value = na_gconf_utils_read_string_list( provider->private->gconf,
entry_path );
fma_boxed_set_from_void( FMA_BOXED( boxed ), slist_value );
- na_core_utils_slist_free( slist_value );
+ fma_core_utils_slist_free( slist_value );
break;
case NA_DATA_TYPE_UINT:
diff --git a/src/io-gconf/nagp-writer.c b/src/io-gconf/nagp-writer.c
index f2d0923..dc4289a 100644
--- a/src/io-gconf/nagp-writer.c
+++ b/src/io-gconf/nagp-writer.c
@@ -38,7 +38,7 @@
#include <api/na-iio-provider.h>
#include <api/na-ifactory-provider.h>
#include <api/na-object-api.h>
-#include <api/na-core-utils.h>
+#include <api/fma-core-utils.h>
#include <api/na-gconf-utils.h>
#include "nagp-gconf-provider.h"
@@ -358,7 +358,7 @@ nagp_writer_write_data( const NAIFactoryProvider *provider, void *writer_data,
*messages = g_slist_append( *messages, msg );
code = NA_IIO_PROVIDER_CODE_WRITE_ERROR;
}
- na_core_utils_slist_free( slist_value );
+ fma_core_utils_slist_free( slist_value );
break;
case NA_DATA_TYPE_UINT:
diff --git a/src/io-xml/naxml-reader.c b/src/io-xml/naxml-reader.c
index 5d72658..d573592 100644
--- a/src/io-xml/naxml-reader.c
+++ b/src/io-xml/naxml-reader.c
@@ -35,7 +35,7 @@
#include <libxml/tree.h>
#include <string.h>
-#include <api/na-core-utils.h>
+#include <api/fma-core-utils.h>
#include <api/na-gconf-utils.h>
#include <api/na-data-types.h>
#include <api/na-ifactory-provider.h>
@@ -334,7 +334,7 @@ naxml_reader_import_from_uri( const NAIImporter *instance, void *parms_ptr )
parms = ( NAIImporterImportFromUriParmsv2 * ) parms_ptr;
parms->imported = NULL;
- if( !na_core_utils_file_is_loadable( parms->uri )){
+ if( !fma_core_utils_file_is_loadable( parms->uri )){
return( IMPORTER_CODE_NOT_LOADABLE );
}
@@ -345,7 +345,7 @@ naxml_reader_import_from_uri( const NAIImporter *instance, void *parms_ptr )
code = reader_parse_xmldoc( reader );
if( code == IMPORTER_CODE_NOT_WILLING_TO ){
- na_core_utils_slist_add_message( &reader->private->parms->messages, ERR_NOT_IOXML );
+ fma_core_utils_slist_add_message( &reader->private->parms->messages, ERR_NOT_IOXML );
}
g_object_unref( reader );
@@ -403,7 +403,7 @@ reader_parse_xmldoc( NAXMLReader *reader )
if( !found ){
gchar *node_list = build_root_node_list();
g_free( node_list );
- na_core_utils_slist_free( reader->private->parms->messages );
+ fma_core_utils_slist_free( reader->private->parms->messages );
reader->private->parms->messages = NULL;
code = IMPORTER_CODE_NOT_WILLING_TO;
}
@@ -458,14 +458,14 @@ iter_on_root_children( NAXMLReader *reader, xmlNode *root )
}
if( strxcmp( iter->name, reader->private->root_node_str->list_key )){
- na_core_utils_slist_add_message( &reader->private->parms->messages,
+ fma_core_utils_slist_add_message( &reader->private->parms->messages,
ERR_NODE_UNKNOWN,
( const char * ) iter->name, iter->line,
reader->private->root_node_str->list_key );
continue;
}
if( found ){
- na_core_utils_slist_add_message( &reader->private->parms->messages,
ERR_NODE_ALREADY_FOUND, ( const char * ) iter->name, iter->line );
+ fma_core_utils_slist_add_message( &reader->private->parms->messages,
ERR_NODE_ALREADY_FOUND, ( const char * ) iter->name, iter->line );
continue;
}
@@ -534,7 +534,7 @@ iter_on_list_children( NAXMLReader *reader, xmlNode *list )
}
if( strxcmp( iter->name, reader->private->root_node_str->element_key )){
- na_core_utils_slist_add_message( &reader->private->parms->messages,
+ fma_core_utils_slist_add_message( &reader->private->parms->messages,
ERR_NODE_UNKNOWN,
( const char * ) iter->name, iter->line,
reader->private->root_node_str->element_key );
continue;
@@ -565,7 +565,7 @@ iter_on_list_children( NAXMLReader *reader, xmlNode *list )
*/
if( code == IMPORTER_CODE_OK ){
if( !reader->private->item_id || !strlen( reader->private->item_id )){
- na_core_utils_slist_add_message( &reader->private->parms->messages,
ERR_ITEM_ID_NOT_FOUND );
+ fma_core_utils_slist_add_message( &reader->private->parms->messages,
ERR_ITEM_ID_NOT_FOUND );
code = IMPORTER_CODE_NO_ITEM_ID;
}
}
@@ -689,7 +689,7 @@ read_data_is_path_adhoc_for_object( NAXMLReader *reader, const NAIFactoryObject
gchar *factory_profile_id;
adhoc = TRUE;
- path_slist = na_core_utils_slist_from_split(( const gchar * ) text, "/" );
+ path_slist = fma_core_utils_slist_from_split(( const gchar * ) text, "/" );
path_length = g_slist_length( path_slist );
if( NA_IS_OBJECT_ITEM( object )){
@@ -718,7 +718,7 @@ read_data_is_path_adhoc_for_object( NAXMLReader *reader, const NAIFactoryObject
g_free( node_profile_id );
}
- na_core_utils_slist_free( path_slist );
+ fma_core_utils_slist_free( path_slist );
return( adhoc );
}
@@ -975,7 +975,7 @@ schema_parse_schema_content( NAXMLReader *reader, xmlNode *schema )
if( !str ){
gchar *node_list = build_key_node_list( naxml_schema_key_schema_str );
- na_core_utils_slist_add_message( &reader->private->parms->messages,
+ fma_core_utils_slist_add_message( &reader->private->parms->messages,
ERR_NODE_UNKNOWN,
( const char * ) iter->name, iter->line, node_list );
g_free( node_list );
@@ -984,7 +984,7 @@ schema_parse_schema_content( NAXMLReader *reader, xmlNode *schema )
}
if( str->reader_found ){
- na_core_utils_slist_add_message( &reader->private->parms->messages,
+ fma_core_utils_slist_add_message( &reader->private->parms->messages,
ERR_NODE_ALREADY_FOUND,
( const char * ) iter->name, iter->line );
reader->private->node_ok = FALSE;
@@ -1039,7 +1039,7 @@ schema_check_for_id( NAXMLReader *reader, xmlNode *iter )
if( reader->private->item_id ){
if( strcmp( reader->private->item_id, id ) != 0 ){
- na_core_utils_slist_add_message( &reader->private->parms->messages,
+ fma_core_utils_slist_add_message( &reader->private->parms->messages,
ERR_NODE_INVALID_ID,
reader->private->item_id, id, iter->line );
reader->private->node_ok = FALSE;
@@ -1072,7 +1072,7 @@ schema_check_for_type( NAXMLReader *reader, xmlNode *iter )
reader->private->parms->imported = NA_OBJECT_ITEM( na_object_menu_new());
} else {
- na_core_utils_slist_add_message( &reader->private->parms->messages,
ERR_NODE_UNKNOWN_TYPE, type, iter->line );
+ fma_core_utils_slist_add_message( &reader->private->parms->messages,
ERR_NODE_UNKNOWN_TYPE, type, iter->line );
reader->private->node_ok = FALSE;
}
@@ -1145,7 +1145,7 @@ dump_parse_entry_content( NAXMLReader *reader, xmlNode *entry )
if( !str ){
gchar *node_list = build_key_node_list( naxml_dump_key_entry_str );
- na_core_utils_slist_add_message( &reader->private->parms->messages,
+ fma_core_utils_slist_add_message( &reader->private->parms->messages,
ERR_NODE_UNKNOWN,
( const char * ) iter->name, iter->line, node_list );
g_free( node_list );
@@ -1154,7 +1154,7 @@ dump_parse_entry_content( NAXMLReader *reader, xmlNode *entry )
}
if( str->reader_found ){
- na_core_utils_slist_add_message( &reader->private->parms->messages,
+ fma_core_utils_slist_add_message( &reader->private->parms->messages,
ERR_NODE_ALREADY_FOUND,
( const char * ) iter->name, iter->line );
reader->private->node_ok = FALSE;
@@ -1197,7 +1197,7 @@ dump_check_for_type( NAXMLReader *reader, xmlNode *key_node )
reader->private->parms->imported = NA_OBJECT_ITEM( na_object_menu_new());
} else {
- na_core_utils_slist_add_message( &reader->private->parms->messages,
ERR_NODE_UNKNOWN_TYPE, type, key_node->line );
+ fma_core_utils_slist_add_message( &reader->private->parms->messages,
ERR_NODE_UNKNOWN_TYPE, type, key_node->line );
reader->private->node_ok = FALSE;
}
@@ -1254,7 +1254,7 @@ dump_read_value( NAXMLReader *reader, xmlNode *node, const NADataDef *def )
}
}
string = slist_to_string( slist );
- na_core_utils_slist_free( slist );
+ fma_core_utils_slist_free( slist );
break;
case NA_DATA_TYPE_POINTER:
@@ -1379,12 +1379,12 @@ is_profile_path( NAXMLReader *reader, xmlChar *text )
GSList *path_slist;
guint path_length;
- path_slist = na_core_utils_slist_from_split(( const gchar * ) text, "/" );
+ path_slist = fma_core_utils_slist_from_split(( const gchar * ) text, "/" );
path_length = g_slist_length( path_slist );
is_profile = ( path_length == 1+reader->private->root_node_str->key_length );
- na_core_utils_slist_free( path_slist );
+ fma_core_utils_slist_free( path_slist );
return( is_profile );
}
diff --git a/src/io-xml/naxml-writer.c b/src/io-xml/naxml-writer.c
index c944609..e46b3ed 100644
--- a/src/io-xml/naxml-writer.c
+++ b/src/io-xml/naxml-writer.c
@@ -36,7 +36,7 @@
#include <libxml/tree.h>
#include <string.h>
-#include <api/na-core-utils.h>
+#include <api/fma-core-utils.h>
#include <api/na-data-types.h>
#include <api/na-object-api.h>
#include <api/na-ifactory-provider.h>
@@ -719,7 +719,7 @@ write_data_dump_element( NAXMLWriter *writer, const NADataDef *def, const NAData
xmlFree( encoded_content );
}
- na_core_utils_slist_free( list );
+ fma_core_utils_slist_free( list );
} else {
encoded_content = xmlEncodeSpecialChars( writer->private->doc, BAD_CAST( value_str ));
@@ -746,7 +746,7 @@ convert_to_gconf_slist( const gchar *slist_str )
gboolean first;
GString *str = g_string_new( "[" );
- values = na_core_utils_slist_from_split( slist_str, ";" );
+ values = fma_core_utils_slist_from_split( slist_str, ";" );
first = TRUE;
for( is = values ; is ; is = is->next ){
@@ -856,7 +856,7 @@ get_output_fname( const NAObjectItem *item, const gchar *folder, const gchar *fo
candidate_fname = g_strdup_printf( "%s/%s.%s", folder, canonical_fname, canonical_ext );
- if( !na_core_utils_file_exists( candidate_fname )){
+ if( !fma_core_utils_file_exists( candidate_fname )){
g_free( canonical_fname );
g_free( canonical_ext );
return( candidate_fname );
@@ -865,7 +865,7 @@ get_output_fname( const NAObjectItem *item, const gchar *folder, const gchar *fo
for( counter = 0 ; ; ++counter ){
g_free( candidate_fname );
candidate_fname = g_strdup_printf( "%s/%s_%d.%s", folder, canonical_fname, counter,
canonical_ext );
- if( !na_core_utils_file_exists( candidate_fname )){
+ if( !fma_core_utils_file_exists( candidate_fname )){
break;
}
}
diff --git a/src/nact/base-builder.c b/src/nact/base-builder.c
index e27b4ea..e7defb3 100644
--- a/src/nact/base-builder.c
+++ b/src/nact/base-builder.c
@@ -31,7 +31,7 @@
#include <config.h>
#endif
-#include <api/na-core-utils.h>
+#include <api/fma-core-utils.h>
#include "base-builder.h"
@@ -187,7 +187,7 @@ instance_finalize( GObject *instance )
self = BASE_BUILDER( instance );
- na_core_utils_slist_free( self->private->fnames );
+ fma_core_utils_slist_free( self->private->fnames );
g_free( self->private );
@@ -258,7 +258,7 @@ already_loaded( BaseBuilder *builder, const gchar *filename )
GSList *it;
for( it = builder->private->fnames ; it && !loaded ; it = it->next ){
- if( !na_core_utils_str_collate(( const gchar * ) it->data, filename )){
+ if( !fma_core_utils_str_collate(( const gchar * ) it->data, filename )){
loaded = TRUE;
}
}
@@ -295,7 +295,7 @@ base_builder_get_toplevel_by_name( const BaseBuilder *builder, const gchar *name
if( toplevel ){
g_return_val_if_fail( GTK_IS_WINDOW( toplevel ), NULL );
} else {
- na_core_utils_slist_dump( thisfn, builder->private->fnames );
+ fma_core_utils_slist_dump( thisfn, builder->private->fnames );
}
}
diff --git a/src/nact/nact-add-capability-dialog.c b/src/nact/nact-add-capability-dialog.c
index 89a0b08..40fc421 100644
--- a/src/nact/nact-add-capability-dialog.c
+++ b/src/nact/nact-add-capability-dialog.c
@@ -35,7 +35,7 @@
#include <glib/gi18n.h>
#include <libintl.h>
-#include <api/na-core-utils.h>
+#include <api/fma-core-utils.h>
#include <core/na-settings.h>
@@ -266,7 +266,7 @@ instance_finalize( GObject *dialog )
self = NACT_ADD_CAPABILITY_DIALOG( dialog );
- na_core_utils_slist_free( self->private->already_used );
+ fma_core_utils_slist_free( self->private->already_used );
g_free( self->private->capability );
g_free( self->private );
@@ -306,7 +306,7 @@ nact_add_capability_dialog_run( NactMainWindow *parent, GSList *capabilities )
BASE_PROP_WSP_NAME, st_wsp_name,
NULL );
- dialog->private->already_used = na_core_utils_slist_duplicate( capabilities );
+ dialog->private->already_used = fma_core_utils_slist_duplicate( capabilities );
capability = NULL;
if( base_window_run( BASE_WINDOW( dialog )) == GTK_RESPONSE_OK ){
@@ -519,7 +519,7 @@ setup_values_iter( GtkTreeModel *model, GtkTreePath *path, GtkTreeIter* iter, GS
gtk_tree_model_get( model, iter, CAPABILITY_KEYWORD_COLUMN, &keyword, CAPABILITY_DESC_COLUMN,
&description, -1 );
- if( na_core_utils_slist_find_negated( capabilities, keyword )){
+ if( fma_core_utils_slist_find_negated( capabilities, keyword )){
/* i18n: add a comment when a capability is already used by current item */
new_description = g_strdup_printf( _( "%s (already inserted)"), description );
gtk_list_store_set( GTK_LIST_STORE( model ), iter, CAPABILITY_DESC_COLUMN, new_description,
CAPABILITY_ALREADY_USED_COLUMN, TRUE, -1 );
diff --git a/src/nact/nact-add-scheme-dialog.c b/src/nact/nact-add-scheme-dialog.c
index 89368b8..cf15182 100644
--- a/src/nact/nact-add-scheme-dialog.c
+++ b/src/nact/nact-add-scheme-dialog.c
@@ -33,7 +33,7 @@
#include <gdk/gdkkeysyms.h>
-#include "api/na-core-utils.h"
+#include "api/fma-core-utils.h"
#include "core/na-settings.h"
@@ -231,7 +231,7 @@ instance_finalize( GObject *dialog )
self = NACT_ADD_SCHEME_DIALOG( dialog );
- na_core_utils_slist_free( self->private->already_used );
+ fma_core_utils_slist_free( self->private->already_used );
g_free( self->private->scheme );
g_free( self->private );
@@ -271,7 +271,7 @@ nact_add_scheme_dialog_run( NactMainWindow *parent, GSList *schemes )
BASE_PROP_WSP_NAME, st_wsp_name,
NULL );
- dialog->private->already_used = na_core_utils_slist_duplicate( schemes );
+ dialog->private->already_used = fma_core_utils_slist_duplicate( schemes );
scheme = NULL;
if( base_window_run( BASE_WINDOW( dialog )) == GTK_RESPONSE_OK ){
diff --git a/src/nact/nact-application.c b/src/nact/nact-application.c
index 7c6dc9c..e3a2ca4 100644
--- a/src/nact/nact-application.c
+++ b/src/nact/nact-application.c
@@ -34,7 +34,7 @@
#include <glib/gi18n.h>
#include <libintl.h>
-#include "api/na-core-utils.h"
+#include "api/fma-core-utils.h"
#include "core/na-about.h"
@@ -365,7 +365,7 @@ manage_options( NactApplication *application )
* if yes, then stops here, exiting with code ok
*/
if( st_version_opt ){
- na_core_utils_print_version();
+ fma_core_utils_print_version();
ret = FALSE;
}
diff --git a/src/nact/nact-assistant-export.c b/src/nact/nact-assistant-export.c
index f0ba222..c4ee778 100644
--- a/src/nact/nact-assistant-export.c
+++ b/src/nact/nact-assistant-export.c
@@ -34,7 +34,7 @@
#include <glib/gi18n.h>
#include <string.h>
-#include "api/na-core-utils.h"
+#include "api/fma-core-utils.h"
#include "api/na-object-api.h"
#include "core/na-exporter.h"
@@ -617,7 +617,7 @@ on_folder_chooser_selection_changed( GtkFileChooser *chooser, NactAssistantExpor
uri = gtk_file_chooser_get_current_folder_uri( chooser );
g_debug( "%s: uri=%s", thisfn, uri );
- enabled = ( uri && strlen( uri ) && na_core_utils_dir_is_writable_uri( uri ));
+ enabled = ( uri && strlen( uri ) && fma_core_utils_dir_is_writable_uri( uri ));
if( enabled ){
g_free( window->private->uri );
@@ -718,7 +718,7 @@ assist_prepare_confirm( NactAssistantExport *window, GtkAssistant *assistant, Gt
g_return_if_fail( NA_IS_EXPORT_FORMAT( format ));
format_label = na_ioption_get_label( format );
- format_label2 = na_core_utils_str_remove_char( format_label, "_" );
+ format_label2 = fma_core_utils_str_remove_char( format_label, "_" );
text = g_strdup_printf( "%s:", format_label2 );
label = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( page ), "p4-ConfirmExportFormat" );
g_return_if_fail( GTK_IS_LABEL( label ));
@@ -728,7 +728,7 @@ assist_prepare_confirm( NactAssistantExport *window, GtkAssistant *assistant, Gt
g_free( text );
format_description = na_ioption_get_description( format );
- format_description2 = na_core_utils_str_remove_char( format_description, "_" );
+ format_description2 = fma_core_utils_str_remove_char( format_description, "_" );
label = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( page ), "p4-ConfirmExportTooltip" );
g_return_if_fail( GTK_IS_LABEL( label ));
gtk_label_set_text( GTK_LABEL( label ), format_description2 );
@@ -902,7 +902,7 @@ free_results( GList *list )
for( ir = list ; ir ; ir = ir->next ){
str = ( ExportStruct * ) ir->data;
g_free( str->fname );
- na_core_utils_slist_free( str->msg );
+ fma_core_utils_slist_free( str->msg );
}
g_list_free( list );
diff --git a/src/nact/nact-assistant-import.c b/src/nact/nact-assistant-import.c
index 64b1ba5..95622f2 100644
--- a/src/nact/nact-assistant-import.c
+++ b/src/nact/nact-assistant-import.c
@@ -36,7 +36,7 @@
#include <string.h>
#include <api/na-object-api.h>
-#include <api/na-core-utils.h>
+#include <api/fma-core-utils.h>
#include <core/na-import-mode.h>
#include <core/na-importer.h>
@@ -488,7 +488,7 @@ on_file_selection_changed( GtkFileChooser *chooser, gpointer user_data )
g_free( folder );
}
- na_core_utils_slist_free( uris );
+ fma_core_utils_slist_free( uris );
content = gtk_assistant_get_nth_page( assistant, pos );
gtk_assistant_set_page_complete( assistant, content, enabled );
@@ -513,7 +513,7 @@ has_loadable_files( GSList *uris )
continue;
}
- if( na_core_utils_file_is_loadable( uri )){
+ if( fma_core_utils_file_is_loadable( uri )){
loadables += 1;
}
}
@@ -623,7 +623,7 @@ prepare_confirm( NactAssistantImport *window, GtkAssistant *assistant, GtkWidget
NA_IOPTIONS_LIST( window ), GTK_WIDGET( window->private->duplicates_listview ));
g_return_if_fail( NA_IS_IMPORT_MODE( window->private->mode ));
mode_label = na_ioption_get_label( window->private->mode );
- label2 = na_core_utils_str_remove_char( mode_label, "_" );
+ label2 = fma_core_utils_str_remove_char( mode_label, "_" );
mode_description = na_ioption_get_description( window->private->mode );
text = g_markup_printf_escaped( "%s\n\n<span style=\"italic\">%s</span>", label2, mode_description );
gtk_label_set_markup( GTK_LABEL( label ), text );
@@ -685,7 +685,7 @@ assistant_apply( BaseAssistant *wnd, GtkAssistant *assistant )
}
}
- na_core_utils_slist_free( importer_parms.uris );
+ fma_core_utils_slist_free( importer_parms.uris );
window->private->results = import_results;
/* then insert the list
diff --git a/src/nact/nact-iaction-tab.c b/src/nact/nact-iaction-tab.c
index 068335c..0dca172 100644
--- a/src/nact/nact-iaction-tab.c
+++ b/src/nact/nact-iaction-tab.c
@@ -34,7 +34,7 @@
#include <glib/gi18n.h>
#include <string.h>
-#include "api/na-core-utils.h"
+#include "api/fma-core-utils.h"
#include "api/na-object-api.h"
#include "core/na-gtk-utils.h"
diff --git a/src/nact/nact-icapabilities-tab.c b/src/nact/nact-icapabilities-tab.c
index 2643881..732de6a 100644
--- a/src/nact/nact-icapabilities-tab.c
+++ b/src/nact/nact-icapabilities-tab.c
@@ -33,7 +33,7 @@
#include <glib/gi18n.h>
-#include "api/na-core-utils.h"
+#include "api/fma-core-utils.h"
#include "api/na-object-api.h"
#include "core/na-gtk-utils.h"
@@ -236,7 +236,7 @@ on_add_clicked( GtkButton *button, NactICapabilitiesTab *instance )
g_free( new_cap );
}
- na_core_utils_slist_free( capabilities );
+ fma_core_utils_slist_free( capabilities );
}
}
diff --git a/src/nact/nact-icommand-tab.c b/src/nact/nact-icommand-tab.c
index 3956c07..7f5a6f6 100644
--- a/src/nact/nact-icommand-tab.c
+++ b/src/nact/nact-icommand-tab.c
@@ -34,7 +34,7 @@
#include <glib/gi18n.h>
#include <string.h>
-#include "api/na-core-utils.h"
+#include "api/fma-core-utils.h"
#include "api/na-object-api.h"
#include "core/na-factory-object.h"
diff --git a/src/nact/nact-ienvironment-tab.c b/src/nact/nact-ienvironment-tab.c
index e99cba0..fbe76c5 100644
--- a/src/nact/nact-ienvironment-tab.c
+++ b/src/nact/nact-ienvironment-tab.c
@@ -36,7 +36,7 @@
#include <stdlib.h>
#include <string.h>
-#include "api/na-core-utils.h"
+#include "api/fma-core-utils.h"
#include "api/na-object-api.h"
#include "core/na-gtk-utils.h"
@@ -383,7 +383,7 @@ on_tree_selection_changed( NactTreeView *tview, GList *selected_items, NactIEnvi
/* selection count
*/
sel_count = context ? na_object_get_selection_count( context ) : g_strdup( "" );
- na_core_utils_selcount_get_ope_int( sel_count, &selcount_ope, &selcount_int );
+ fma_core_utils_selcount_get_ope_int( sel_count, &selcount_ope, &selcount_int );
set_selection_count_selection( instance, selcount_ope, selcount_int );
g_free( selcount_int );
g_free( selcount_ope );
diff --git a/src/nact/nact-ifolders-tab.c b/src/nact/nact-ifolders-tab.c
index ceb43c8..79634b1 100644
--- a/src/nact/nact-ifolders-tab.c
+++ b/src/nact/nact-ifolders-tab.c
@@ -34,7 +34,7 @@
#include <glib/gi18n.h>
#include <string.h>
-#include "api/na-core-utils.h"
+#include "api/fma-core-utils.h"
#include "api/na-object-api.h"
#include "core/na-gtk-utils.h"
diff --git a/src/nact/nact-ischemes-tab.c b/src/nact/nact-ischemes-tab.c
index cfe80e2..71328ae 100644
--- a/src/nact/nact-ischemes-tab.c
+++ b/src/nact/nact-ischemes-tab.c
@@ -33,7 +33,7 @@
#include <glib/gi18n.h>
-#include "api/na-core-utils.h"
+#include "api/fma-core-utils.h"
#include "api/na-object-api.h"
#include "core/na-gtk-utils.h"
@@ -241,7 +241,7 @@ on_add_from_defaults( GtkButton *button, NactISchemesTab *instance )
schemes = nact_match_list_get_rows( NACT_MAIN_WINDOW( instance ), ITAB_NAME );
new_scheme = nact_add_scheme_dialog_run( NACT_MAIN_WINDOW( instance ), schemes );
- na_core_utils_slist_free( schemes );
+ fma_core_utils_slist_free( schemes );
if( new_scheme ){
nact_match_list_insert_row( NACT_MAIN_WINDOW( instance ), ITAB_NAME, new_scheme, FALSE, FALSE
);
diff --git a/src/nact/nact-match-list.c b/src/nact/nact-match-list.c
index 6fd529f..3cf24e4 100644
--- a/src/nact/nact-match-list.c
+++ b/src/nact/nact-match-list.c
@@ -35,7 +35,7 @@
#include <libintl.h>
#include "api/na-object-api.h"
-#include "api/na-core-utils.h"
+#include "api/fma-core-utils.h"
#include "base-keysyms.h"
#include "base-gtk-utils.h"
@@ -356,7 +356,7 @@ on_tree_selection_changed( NactTreeView *treeview, GList *selected_items, MatchL
gtk_list_store_clear( GTK_LIST_STORE( model ));
if( filters ){
- na_core_utils_slist_dump( thisfn, filters );
+ fma_core_utils_slist_dump( thisfn, filters );
g_slist_foreach( filters, ( GFunc ) iter_for_setup, model );
}
@@ -404,7 +404,7 @@ nact_match_list_insert_row( NactMainWindow *window, const gchar *tab_name, const
* @tab_name: a string constant which identifies this page.
*
* Returns the list of rows as a newly allocated string list which should
- * be na_core_utils_slist_free() by the caller.
+ * be fma_core_utils_slist_free() by the caller.
*/
GSList *
nact_match_list_get_rows( NactMainWindow *window, const gchar *tab_name )
@@ -494,10 +494,10 @@ on_filter_edited( GtkCellRendererText *renderer, const gchar *path_str, const gc
if( filters ){
to_remove = g_strdup( old_text );
- filters = na_core_utils_slist_remove_ascii( filters, to_remove );
+ filters = fma_core_utils_slist_remove_ascii( filters, to_remove );
g_free( to_remove );
to_remove = g_strdup_printf( "!%s", old_text );
- filters = na_core_utils_slist_remove_ascii( filters, to_remove );
+ filters = fma_core_utils_slist_remove_ascii( filters, to_remove );
g_free( to_remove );
}
@@ -510,7 +510,7 @@ on_filter_edited( GtkCellRendererText *renderer, const gchar *path_str, const gc
}
( *data->pset )( context, filters );
- na_core_utils_slist_free( filters );
+ fma_core_utils_slist_free( filters );
g_free( old_text );
g_signal_emit_by_name( G_OBJECT( data->window ), MAIN_SIGNAL_ITEM_UPDATED, context, 0 );
@@ -588,14 +588,14 @@ on_must_match_toggled( GtkCellRendererToggle *cell_renderer, gchar *path_str, Ma
if( filters ){
to_remove = g_strdup_printf( "!%s", filter );
- filters = na_core_utils_slist_remove_ascii( filters, to_remove );
+ filters = fma_core_utils_slist_remove_ascii( filters, to_remove );
g_free( to_remove );
}
filters = g_slist_prepend( filters, g_strdup( filter ));
( *data->pset )( context, filters );
- na_core_utils_slist_free( filters );
+ fma_core_utils_slist_free( filters );
g_free( filter );
g_signal_emit_by_name( G_OBJECT( data->window ), MAIN_SIGNAL_ITEM_UPDATED, context, 0
);
@@ -639,14 +639,14 @@ on_must_not_match_toggled( GtkCellRendererToggle *cell_renderer, gchar *path_str
filters = ( *data->pget )( context );
if( filters ){
- filters = na_core_utils_slist_remove_ascii( filters, filter );
+ filters = fma_core_utils_slist_remove_ascii( filters, filter );
}
to_add = g_strdup_printf( "!%s", filter );
filters = g_slist_prepend( filters, to_add );
( *data->pset )( context, filters );
- na_core_utils_slist_free( filters );
+ fma_core_utils_slist_free( filters );
g_free( filter );
g_signal_emit_by_name( G_OBJECT( data->window ), MAIN_SIGNAL_ITEM_UPDATED, context, 0
);
@@ -685,7 +685,7 @@ add_filter( MatchListData *data, const gchar *filter, const gchar *prefix )
to_add = g_strdup_printf( "%s%s", prefix, filter );
filters = g_slist_prepend( filters, to_add );
( *data->pset )( context, filters );
- na_core_utils_slist_free( filters );
+ fma_core_utils_slist_free( filters );
g_signal_emit_by_name( G_OBJECT( data->window ), MAIN_SIGNAL_ITEM_UPDATED, context, 0 );
}
@@ -701,8 +701,8 @@ count_filters( const gchar *filter, MatchListData *data )
model = gtk_tree_view_get_model( data->listview );
filters = NULL;
gtk_tree_model_foreach( model, ( GtkTreeModelForeachFunc ) get_rows_iter, &filters );
- count = na_core_utils_slist_count( filters, filter );
- na_core_utils_slist_free( filters );
+ count = fma_core_utils_slist_count( filters, filter );
+ fma_core_utils_slist_free( filters );
return( count );
}
@@ -738,11 +738,11 @@ delete_current_row( MatchListData *data )
if( filters ){
to_remove = g_strdup_printf( "!%s", filter );
- filters = na_core_utils_slist_remove_ascii( filters, to_remove );
+ filters = fma_core_utils_slist_remove_ascii( filters, to_remove );
g_free( to_remove );
- filters = na_core_utils_slist_remove_ascii( filters, filter );
+ filters = fma_core_utils_slist_remove_ascii( filters, filter );
( *data->pset )( context, filters );
- na_core_utils_slist_free( filters );
+ fma_core_utils_slist_free( filters );
g_signal_emit_by_name( G_OBJECT( data->window ), MAIN_SIGNAL_ITEM_UPDATED,
context, 0 );
}
@@ -779,8 +779,8 @@ dump_current_rows( MatchListData *data )
model = gtk_tree_view_get_model( data->listview );
filters = NULL;
gtk_tree_model_foreach( model, ( GtkTreeModelForeachFunc ) get_rows_iter, &filters );
- na_core_utils_slist_dump( "nact_match_list_dump_current_rows", filters );
- na_core_utils_slist_free( filters );
+ fma_core_utils_slist_dump( "nact_match_list_dump_current_rows", filters );
+ fma_core_utils_slist_free( filters );
#endif
}
diff --git a/src/nact/nact-menu-edit.c b/src/nact/nact-menu-edit.c
index ab87957..067fd48 100644
--- a/src/nact/nact-menu-edit.c
+++ b/src/nact/nact-menu-edit.c
@@ -33,7 +33,7 @@
#include <glib/gi18n.h>
-#include "api/na-core-utils.h"
+#include "api/fma-core-utils.h"
#include "core/na-io-provider.h"
@@ -218,13 +218,13 @@ nact_menu_edit_cut( NactMainWindow *main_window )
to_delete = get_deletables( sdata->updater, items, &ndeletables );
if( ndeletables ){
- gchar *second = na_core_utils_slist_join_at_end( ndeletables, "\n" );
+ gchar *second = fma_core_utils_slist_join_at_end( ndeletables, "\n" );
base_window_display_error_dlg(
BASE_WINDOW( main_window ),
_( "Not all items have been cut as following ones are not modifiable:" ),
second );
g_free( second );
- na_core_utils_slist_free( ndeletables );
+ fma_core_utils_slist_free( ndeletables );
}
if( to_delete ){
@@ -464,13 +464,13 @@ nact_menu_edit_delete( NactMainWindow *main_window )
to_delete = get_deletables( sdata->updater, items, &ndeletables );
if( ndeletables ){
- gchar *second = na_core_utils_slist_join_at_end( ndeletables, "\n" );
+ gchar *second = fma_core_utils_slist_join_at_end( ndeletables, "\n" );
base_window_display_error_dlg(
BASE_WINDOW( main_window ),
_( "Not all items have been deleted as following ones are not modifiable:" ),
second );
g_free( second );
- na_core_utils_slist_free( ndeletables );
+ fma_core_utils_slist_free( ndeletables );
}
if( to_delete ){
diff --git a/src/nact/nact-menu-file.c b/src/nact/nact-menu-file.c
index 9e55e4e..a51e621 100644
--- a/src/nact/nact-menu-file.c
+++ b/src/nact/nact-menu-file.c
@@ -34,7 +34,7 @@
#include <glib/gi18n.h>
#include <libintl.h>
-#include <api/na-core-utils.h>
+#include <api/fma-core-utils.h>
#include <api/na-timeout.h>
#include <core/na-io-provider.h>
@@ -252,13 +252,13 @@ nact_menu_file_save_items( NactMainWindow *window )
if( nact_tree_ieditable_is_level_zero_modified( NACT_TREE_IEDITABLE( items_view ))){
if( !na_iprefs_write_level_zero( items, &messages )){
if( g_slist_length( messages )){
- msg = na_core_utils_slist_join_at_end( messages, "\n" );
+ msg = fma_core_utils_slist_join_at_end( messages, "\n" );
} else {
msg = g_strdup( gettext( st_level_zero_write ));
}
base_window_display_error_dlg( NULL, gettext( st_save_error ), msg );
g_free( msg );
- na_core_utils_slist_free( messages );
+ fma_core_utils_slist_free( messages );
messages = NULL;
}
@@ -272,13 +272,13 @@ nact_menu_file_save_items( NactMainWindow *window )
*/
if( !nact_tree_ieditable_remove_deleted( NACT_TREE_IEDITABLE( items_view ), &messages )){
if( g_slist_length( messages )){
- msg = na_core_utils_slist_join_at_end( messages, "\n" );
+ msg = fma_core_utils_slist_join_at_end( messages, "\n" );
} else {
msg = g_strdup( gettext( st_delete_error ));
}
base_window_display_error_dlg( NULL, gettext( st_save_error ), msg );
g_free( msg );
- na_core_utils_slist_free( messages );
+ fma_core_utils_slist_free( messages );
messages = NULL;
} else {
@@ -302,10 +302,10 @@ nact_menu_file_save_items( NactMainWindow *window )
}
if( g_slist_length( messages )){
- msg = na_core_utils_slist_join_at_end( messages, "\n" );
+ msg = fma_core_utils_slist_join_at_end( messages, "\n" );
base_window_display_error_dlg( NULL, gettext( st_save_warning ), msg );
g_free( msg );
- na_core_utils_slist_free( messages );
+ fma_core_utils_slist_free( messages );
messages = NULL;
}
diff --git a/src/nact/nact-providers-list.c b/src/nact/nact-providers-list.c
index c034108..24edc62 100644
--- a/src/nact/nact-providers-list.c
+++ b/src/nact/nact-providers-list.c
@@ -33,7 +33,7 @@
#include <glib/gi18n.h>
-#include <api/na-core-utils.h>
+#include <api/fma-core-utils.h>
#include <api/na-gconf-utils.h>
#include <api/na-object-api.h>
@@ -366,7 +366,7 @@ nact_providers_list_save( BaseWindow *window )
plsd->order = g_slist_reverse( plsd->order );
na_settings_set_string_list( NA_IPREFS_IO_PROVIDERS_WRITE_ORDER, plsd->order );
- na_core_utils_slist_free( plsd->order );
+ fma_core_utils_slist_free( plsd->order );
g_free( plsd );
}
diff --git a/src/nact/nact-schemes-list.c b/src/nact/nact-schemes-list.c
index 3dbc7b6..1dcb5af 100644
--- a/src/nact/nact-schemes-list.c
+++ b/src/nact/nact-schemes-list.c
@@ -33,7 +33,7 @@
#include <glib/gi18n.h>
-#include <api/na-core-utils.h>
+#include <api/fma-core-utils.h>
#include <api/na-object-api.h>
#include "base-keysyms.h"
@@ -250,12 +250,12 @@ init_view_setup_defaults( SchemesListData *data )
g_strfreev( tokens );
}
- na_core_utils_slist_free( schemes );
+ fma_core_utils_slist_free( schemes );
}
/*
* return default schemes list
- * the returned list must be released with #na_core_utils_slist_free()
+ * the returned list must be released with #fma_core_utils_slist_free()
*/
static GSList *
init_view_get_default_list( SchemesListData *data )
@@ -267,7 +267,7 @@ init_view_get_default_list( SchemesListData *data )
if( !list ){
list = init_view_get_default_default_list( data );
}
- na_core_utils_slist_dump( "default_list", list );
+ fma_core_utils_slist_dump( "default_list", list );
data->editable &= !mandatory;
@@ -395,7 +395,7 @@ setup_values_iter( GtkTreeModel *model, GtkTreePath *path, GtkTreeIter* iter, GS
gtk_tree_model_get( model, iter, SCHEMES_KEYWORD_COLUMN, &keyword, SCHEMES_DESC_COLUMN, &description,
-1 );
- if( na_core_utils_slist_find_negated( schemes, keyword )){
+ if( fma_core_utils_slist_find_negated( schemes, keyword )){
/* i18n: add a comment when a scheme is already used by current item */
new_description = g_strdup_printf( _( "%s (already used)"), description );
gtk_list_store_set( GTK_LIST_STORE( model ), iter, SCHEMES_DESC_COLUMN, new_description,
SCHEMES_ALREADY_USED_COLUMN, TRUE, -1 );
@@ -487,7 +487,7 @@ nact_schemes_list_save_defaults( BaseWindow *window )
na_settings_set_string_list( NA_IPREFS_SCHEME_DEFAULT_LIST, schemes );
- na_core_utils_slist_free( schemes );
+ fma_core_utils_slist_free( schemes );
}
static GSList *
diff --git a/src/nact/nact-tree-ieditable.c b/src/nact/nact-tree-ieditable.c
index bdfc4e2..00d6766 100644
--- a/src/nact/nact-tree-ieditable.c
+++ b/src/nact/nact-tree-ieditable.c
@@ -31,7 +31,7 @@
#include <config.h>
#endif
-#include <api/na-core-utils.h>
+#include <api/fma-core-utils.h>
#include <api/na-object-api.h>
#include <core/na-factory-object.h>
@@ -1069,8 +1069,8 @@ get_items_id_list_str( GList *items_list )
}
slist = g_slist_reverse( slist );
- list_str = na_core_utils_slist_join_at_end( slist, ";" );
- na_core_utils_slist_free( slist );
+ list_str = fma_core_utils_slist_join_at_end( slist, ";" );
+ fma_core_utils_slist_free( slist );
return( list_str );
}
diff --git a/src/nact/nact-tree-model-dnd.c b/src/nact/nact-tree-model-dnd.c
index 38ae789..7343002 100644
--- a/src/nact/nact-tree-model-dnd.c
+++ b/src/nact/nact-tree-model-dnd.c
@@ -35,7 +35,7 @@
#include <libintl.h>
#include <string.h>
-#include <api/na-core-utils.h>
+#include <api/fma-core-utils.h>
#include <api/na-object-api.h>
#include <core/na-gnome-vfs-uri.h>
@@ -350,7 +350,7 @@ nact_tree_model_dnd_imulti_drag_source_drag_data_get( EggTreeMultiDragSource *dr
/* check that target folder is writable
*/
- is_writable = na_core_utils_dir_is_writable_uri( dest_folder );
+ is_writable = fma_core_utils_dir_is_writable_uri( dest_folder );
g_debug( "%s: dest_folder=%s, is_writable=%s", thisfn, dest_folder,
is_writable ? "True":"False" );
gtk_selection_data_set( selection_data,
selection_data_target, 8, ( guchar * )( is_writable ? "S" :
"F" ), 1 );
@@ -903,7 +903,7 @@ drop_uri_list( NactTreeModel *model, GtkTreePath *dest, GtkSelectionData *selec
g_debug( "%s", selection_data_data );
memset( &parms, '\0', sizeof( NAImporterParms ));
- parms.uris = g_slist_reverse( na_core_utils_slist_from_split( selection_data_data, "\r\n" ));
+ parms.uris = g_slist_reverse( fma_core_utils_slist_from_split( selection_data_data, "\r\n" ));
parms.check_fn = ( NAImporterCheckFn ) is_dropped_already_exists;
parms.check_fn_data = main_window;
parms.preferred_mode = 0;
@@ -946,7 +946,7 @@ drop_uri_list( NactTreeModel *model, GtkTreePath *dest, GtkSelectionData *selec
bar, TREE_MODEL_STATUSBAR_CONTEXT, messages->data );
}
if( count > 1 ){
- dlg_message = na_core_utils_slist_join_at_end( messages, "\n" );
+ dlg_message = fma_core_utils_slist_join_at_end( messages, "\n" );
g_debug( "%s: dlg_message='%s'", thisfn, dlg_message );
dialog = gtk_message_dialog_new(
parms.parent_toplevel,
@@ -980,7 +980,7 @@ drop_uri_list( NactTreeModel *model, GtkTreePath *dest, GtkSelectionData *selec
drop_done = TRUE;
na_object_free_items( imported );
na_object_free_items( overriden );
- na_core_utils_slist_free( parms.uris );
+ fma_core_utils_slist_free( parms.uris );
for( it = import_results ; it ; it = it->next ){
na_importer_free_result( it->data );
diff --git a/src/plugin-menu/nautilus-actions.c b/src/plugin-menu/nautilus-actions.c
index 2e321fd..fdba6f5 100644
--- a/src/plugin-menu/nautilus-actions.c
+++ b/src/plugin-menu/nautilus-actions.c
@@ -39,7 +39,7 @@
#include <libnautilus-extension/nautilus-file-info.h>
#include <libnautilus-extension/nautilus-menu-provider.h>
-#include <api/na-core-utils.h>
+#include <api/fma-core-utils.h>
#include <api/na-object-api.h>
#include <api/na-timeout.h>
@@ -684,8 +684,8 @@ expand_tokens_item( const NAObjectItem *src, NATokens *tokens )
new_slist = g_slist_prepend( new_slist, new );
}
na_object_set_items_slist( item, new_slist );
- na_core_utils_slist_free( subitems_slist );
- na_core_utils_slist_free( new_slist );
+ fma_core_utils_slist_free( subitems_slist );
+ fma_core_utils_slist_free( new_slist );
/* last, deal with profiles of an action
*/
diff --git a/src/test/test-reader.c b/src/test/test-reader.c
index a1f723d..87014eb 100755
--- a/src/test/test-reader.c
+++ b/src/test/test-reader.c
@@ -34,7 +34,7 @@
#include <glib/gi18n.h>
#include <stdlib.h>
-#include <api/na-core-utils.h>
+#include <api/fma-core-utils.h>
#include <core/na-pivot.h>
#include <core/na-importer.h>
@@ -92,8 +92,8 @@ main( int argc, char **argv )
g_object_unref( result->imported );
}
- na_core_utils_slist_dump( NULL, result->messages );
- na_core_utils_slist_free( result->messages );
+ fma_core_utils_slist_dump( NULL, result->messages );
+ fma_core_utils_slist_free( result->messages );
return( 0 );
}
@@ -156,7 +156,7 @@ check_options( int argc, char **argv, GOptionContext *context )
g_option_context_free( context );
if( version ){
- na_core_utils_print_version();
+ fma_core_utils_print_version();
exit( EXIT_SUCCESS );
}
diff --git a/src/utils/na-delete-xmltree.c b/src/utils/na-delete-xmltree.c
index afb4074..d0b8d93 100644
--- a/src/utils/na-delete-xmltree.c
+++ b/src/utils/na-delete-xmltree.c
@@ -52,7 +52,7 @@
* XML backend. It is based on http://xmlsoft.org/examples/xpath2.c
*/
-#include <api/na-core-utils.h>
+#include <api/fma-core-utils.h>
#include "console-utils.h"
@@ -118,7 +118,7 @@ main( int argc, char** argv )
g_option_context_free( context );
if( version ){
- na_core_utils_print_version();
+ fma_core_utils_print_version();
exit( status );
}
diff --git a/src/utils/na-print-schemas.c b/src/utils/na-print-schemas.c
index ced228c..ed8a3f7 100644
--- a/src/utils/na-print-schemas.c
+++ b/src/utils/na-print-schemas.c
@@ -39,7 +39,7 @@
#include <locale.h>
#include <stdlib.h>
-#include <api/na-core-utils.h>
+#include <api/fma-core-utils.h>
#include <api/na-data-types.h>
#include <api/na-ifactory-object-data.h>
@@ -115,7 +115,7 @@ main( int argc, char** argv )
}
if( version ){
- na_core_utils_print_version();
+ fma_core_utils_print_version();
exit( status );
}
@@ -139,7 +139,7 @@ main( int argc, char** argv )
for( im = msgs ; im ; im = im->next ){
g_printerr( "%s\n", ( gchar * ) im->data );
}
- na_core_utils_slist_free( msgs );
+ fma_core_utils_slist_free( msgs );
status = EXIT_FAILURE;
}
@@ -242,7 +242,7 @@ output_to_stdout( NADataGroup *groups, GSList **msgs )
for( ig = 0 ; groups[ig].group ; ++ig ){
for( id = 0 ; groups[ig].def[id].name ; ++id ){
if( groups[ig].def[id].writable ){
- if( !na_core_utils_slist_count( displayed, groups[ig].def[id].name )){
+ if( !fma_core_utils_slist_count( displayed, groups[ig].def[id].name )){
displayed = g_slist_prepend( displayed, groups[ig].def[id].name );
attach_schema_node( doc, list_node, ( const NADataDef * )
groups[ig].def+id );
}
diff --git a/src/utils/na-set-conf.c b/src/utils/na-set-conf.c
index a4a9b90..f17da70 100644
--- a/src/utils/na-set-conf.c
+++ b/src/utils/na-set-conf.c
@@ -37,7 +37,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include <api/na-core-utils.h>
+#include <api/fma-core-utils.h>
#include "console-utils.h"
@@ -125,7 +125,7 @@ main( int argc, char** argv )
g_option_context_free( context );
if( st_version ){
- na_core_utils_print_version();
+ fma_core_utils_print_version();
exit( status );
}
@@ -234,7 +234,7 @@ do_update_conf( const gchar *group, const gchar *key, NAType type, const gchar *
switch( type ){
case TYPE_BOOL:
- bvalue = na_core_utils_boolean_from_string( value );
+ bvalue = fma_core_utils_boolean_from_string( value );
ok = na_settings_set_boolean_ex( group, key, bvalue );
break;
diff --git a/src/utils/nautilus-actions-new.c b/src/utils/nautilus-actions-new.c
index da40fa9..10e72ee 100644
--- a/src/utils/nautilus-actions-new.c
+++ b/src/utils/nautilus-actions-new.c
@@ -38,7 +38,7 @@
#include <locale.h>
#include <stdlib.h>
-#include <api/na-core-utils.h>
+#include <api/fma-core-utils.h>
#include <api/na-iio-provider.h>
#include <api/na-object-api.h>
@@ -210,7 +210,7 @@ main( int argc, char** argv )
}
if( version ){
- na_core_utils_print_version();
+ fma_core_utils_print_version();
exit( status );
}
@@ -283,7 +283,7 @@ main( int argc, char** argv )
for( im = msg ; im ; im = im->next ){
g_printerr( "%s\n", ( gchar * ) im->data );
}
- na_core_utils_slist_free( msg );
+ fma_core_utils_slist_free( msg );
status = EXIT_FAILURE;
}
@@ -446,7 +446,7 @@ get_action_from_cmdline( void )
}
if( basenames && g_slist_length( basenames )){
na_object_set_basenames( profile, basenames );
- na_core_utils_slist_free( basenames );
+ fma_core_utils_slist_free( basenames );
}
na_object_set_matchcase( profile, matchcase );
@@ -474,7 +474,7 @@ get_action_from_cmdline( void )
}
if( mimetypes && g_slist_length( mimetypes )){
na_object_set_mimetypes( profile, mimetypes );
- na_core_utils_slist_free( mimetypes );
+ fma_core_utils_slist_free( mimetypes );
}
if( accept_multiple ){
@@ -495,7 +495,7 @@ get_action_from_cmdline( void )
}
if( schemes && g_slist_length( schemes )){
na_object_set_schemes( profile, schemes );
- na_core_utils_slist_free( schemes );
+ fma_core_utils_slist_free( schemes );
}
i = 0;
@@ -506,7 +506,7 @@ get_action_from_cmdline( void )
}
if( folders && g_slist_length( folders )){
na_object_set_folders( profile, folders );
- na_core_utils_slist_free( folders );
+ fma_core_utils_slist_free( folders );
}
if( onlyshow_array ){
@@ -516,7 +516,7 @@ get_action_from_cmdline( void )
}
if( only_show_in && g_slist_length( only_show_in )){
na_object_set_only_show_in( profile, only_show_in );
- na_core_utils_slist_free( only_show_in );
+ fma_core_utils_slist_free( only_show_in );
}
}
@@ -527,7 +527,7 @@ get_action_from_cmdline( void )
}
if( not_show_in && g_slist_length( not_show_in )){
na_object_set_not_show_in( profile, not_show_in );
- na_core_utils_slist_free( not_show_in );
+ fma_core_utils_slist_free( not_show_in );
}
}
@@ -564,7 +564,7 @@ get_action_from_cmdline( void )
}
if( capabilities && g_slist_length( capabilities )){
na_object_set_capabilities( profile, capabilities );
- na_core_utils_slist_free( capabilities );
+ fma_core_utils_slist_free( capabilities );
}
}
diff --git a/src/utils/nautilus-actions-print.c b/src/utils/nautilus-actions-print.c
index 580be08..8f56764 100644
--- a/src/utils/nautilus-actions-print.c
+++ b/src/utils/nautilus-actions-print.c
@@ -38,7 +38,7 @@
#include <stdlib.h>
#include <string.h>
-#include <api/na-core-utils.h>
+#include <api/fma-core-utils.h>
#include <api/na-object-api.h>
#include <core/na-exporter.h>
@@ -115,7 +115,7 @@ main( int argc, char** argv )
g_option_context_free( context );
if( version ){
- na_core_utils_print_version();
+ fma_core_utils_print_version();
exit( status );
}
@@ -223,7 +223,7 @@ export_item( const NAObjectItem *item, const gchar *format )
for( it = messages ; it ; it = it->next ){
g_printerr( "%s\n", ( const gchar * ) it->data );
}
- na_core_utils_slist_free( messages );
+ fma_core_utils_slist_free( messages );
if( buffer ){
g_printf( "%s\n", buffer );
diff --git a/src/utils/nautilus-actions-run.c b/src/utils/nautilus-actions-run.c
index c265d37..fd5ac8d 100644
--- a/src/utils/nautilus-actions-run.c
+++ b/src/utils/nautilus-actions-run.c
@@ -37,7 +37,7 @@
#include <stdlib.h>
#include <string.h>
-#include <api/na-core-utils.h>
+#include <api/fma-core-utils.h>
#include <api/na-object-api.h>
#include <api/na-dbus.h>
@@ -124,7 +124,7 @@ main( int argc, char** argv )
g_option_context_free( context );
if( version ){
- na_core_utils_print_version();
+ fma_core_utils_print_version();
exit( status );
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
