GNOME.org
 

[nautilus-actions] Refactoring: rename src/io-gconf/nagp-read.{c, h} to src/io-gconf/nagp-reader.{c, h}

commit 03c36b23849d3691ac7478367d7218abcee27ddc
Author: Pierre Wieser <pwieser trychlos org>
Date:   Mon Feb 15 18:26:21 2010 +0100

    Refactoring: rename src/io-gconf/nagp-read.{c,h} to src/io-gconf/nagp-reader.{c,h}

 ChangeLog                                   |    2 +
 src/io-gconf/Makefile.am                    |   44 ++---
 src/io-gconf/{nagp-read.c => nagp-reader.c} |  283 +++++++--------------------
 src/io-gconf/{nagp-read.h => nagp-reader.h} |    8 +-
 4 files changed, 95 insertions(+), 242 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 30b3334..054494c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2009-02-15 Pierre Wieser <pwieser trychlos org>
 
+	Rename src/io-gconf/nagp-read.{c,h} to src/io-gconf/nagp-reader.{c,h}
+
 	Update I/O desktop provider.
 
 	* src/io-desktop/nadp-keys.c:
diff --git a/src/io-gconf/Makefile.am b/src/io-gconf/Makefile.am
index c49a409..14add9d 100644
--- a/src/io-gconf/Makefile.am
+++ b/src/io-gconf/Makefile.am
@@ -26,37 +26,31 @@
 #   Pierre Wieser <pwieser trychlos org>
 #   ... and many others (see AUTHORS)
 
-pluginsdir = $(pkglibdir)
-
-plugins_LTLIBRARIES=libna-io-provider-gconf.la
+pkglib_LTLIBRARIES = libna-io-gconf.la
 
 AM_CPPFLAGS += \
-	-I $(top_srcdir)											\
-	-I $(top_srcdir)/nautilus-actions							\
-	$(NAUTILUS_ACTIONS_CFLAGS)									\
-	-DG_LOG_DOMAIN=\"${NA_LOGDOMAIN_IO_PROVIDER_GCONF}\"		\
+	-I $(top_srcdir)									\
+	$(NAUTILUS_ACTIONS_CFLAGS)							\
+	-DG_LOG_DOMAIN=\"${NA_LOGDOMAIN_IO_GCONF}\"			\
 	$(NULL)
 
-libna_io_provider_gconf_la_SOURCES = \
-	nagp-gconf-provider.c										\
-	nagp-gconf-provider.h										\
-	nagp-keys.h													\
-	nagp-module.c												\
-	nagp-read.c													\
-	nagp-read.h													\
-	nagp-write.c												\
-	nagp-write.h												\
+libna_io_gconf_la_SOURCES = \
+	nagp-gconf-provider.c								\
+	nagp-gconf-provider.h								\
+	nagp-keys.h											\
+	nagp-module.c										\
+	nagp-reader.c										\
+	nagp-reader.h										\
+	nagp-write.c										\
+	nagp-write.h										\
 	$(NULL)
 
-libna_io_provider_gconf_la_LIBADD = \
-	-L$(top_builddir)/nautilus-actions/api		-lna-api		\
-	-L$(top_builddir)/nautilus-actions/private	-lna-private	\
-	-L$(top_builddir)/nautilus-actions/runtime	-lna-runtime	\
+libna_io_gconf_la_LIBADD = \
+	$(top_builddir)/src/core/libna-core.la				\
 	$(NULL)
 
-VERSION_INFO = 1:0:0
-libna_io_provider_gconf_la_LDFLAGS = \
-	-module 													\
-	-no-undefined												\
-	-version-number $(VERSION_INFO)								\
+libna_io_gconf_la_LDFLAGS = \
+	-module 											\
+	-no-undefined										\
+	-avoid-version										\
 	$(NULL)
diff --git a/src/io-gconf/nagp-read.c b/src/io-gconf/nagp-reader.c
similarity index 60%
rename from src/io-gconf/nagp-read.c
rename to src/io-gconf/nagp-reader.c
index 0b683bc..9a72c9a 100644
--- a/src/io-gconf/nagp-read.c
+++ b/src/io-gconf/nagp-reader.c
@@ -32,16 +32,16 @@
 #include <config.h>
 #endif
 
-#include <nautilus-actions/api/na-iio-provider.h>
-#include <nautilus-actions/api/na-object-api.h>
+#include <string.h>
 
-/* only possible because we are an internal plugin */
-#include <runtime/na-gconf-utils.h>
+#include <api/na-iio-provider.h>
+#include <api/na-object-api.h>
+#include <api/na-core-utils.h>
+#include <api/na-gconf-utils.h>
 
 #include "nagp-gconf-provider.h"
 #include "nagp-keys.h"
-#include "nagp-read.h"
-#include "nagp-write.h"
+#include "nagp-reader.h"
 
 static NAObjectItem  *read_item( NagpGConfProvider *provider, const gchar *path );
 static void           read_item_action( NagpGConfProvider *provider, const gchar *path, NAObjectAction *action );
@@ -53,12 +53,7 @@ static void           read_item_menu( NagpGConfProvider *provider, const gchar *
 static void           read_item_menu_properties( NagpGConfProvider *provider, GSList *entries, NAObjectMenu *menu );
 static void           read_object_item_properties( NagpGConfProvider *provider, GSList *entries, NAObjectItem *item );
 
-static GSList        *get_subdirs( GConfClient *gconf, const gchar *path );
-static void           free_subdirs( GSList *subdirs );
 static gboolean       is_key_writable( NagpGConfProvider *gconf, const gchar *key );
-static gboolean       has_entry( GConfClient *gconf, const gchar *path, const gchar *entry );
-static GSList        *remove_from_gslist( GSList *list, const gchar *str );
-static void           free_gslist( GSList *list );
 
 /*
  * nagp_iio_provider_read_items:
@@ -84,7 +79,7 @@ nagp_iio_provider_read_items( const NAIIOProvider *provider, GSList **messages )
 
 	if( !self->private->dispose_has_run ){
 
-		listpath = get_subdirs( self->private->gconf, NA_GCONF_CONFIG_PATH );
+		listpath = na_gconf_utils_get_subdirs( self->private->gconf, NAGP_CONFIGURATIONS_PATH );
 
 		for( ip = listpath ; ip ; ip = ip->next ){
 
@@ -94,12 +89,16 @@ nagp_iio_provider_read_items( const NAIIOProvider *provider, GSList **messages )
 			}
 		}
 
-		free_subdirs( listpath );
+		na_gconf_utils_free_subdirs( listpath );
 	}
 
+	g_debug( "%s: count=%d", thisfn, g_list_length( items_list ));
 	return( items_list );
 }
 
+/*
+ * path is here the full path to an item
+ */
 static NAObjectItem *
 read_item( NagpGConfProvider *provider, const gchar *path )
 {
@@ -114,21 +113,21 @@ read_item( NagpGConfProvider *provider, const gchar *path )
 	g_return_val_if_fail( NA_IS_IIO_PROVIDER( provider ), NULL );
 	g_return_val_if_fail( !provider->private->dispose_has_run, NULL );
 
-	have_type = has_entry( provider->private->gconf, path, OBJECT_ITEM_TYPE_ENTRY );
-	full_path = gconf_concat_dir_and_key( path, OBJECT_ITEM_TYPE_ENTRY );
-	type = na_gconf_utils_read_string( provider->private->gconf, full_path, TRUE, OBJECT_ITEM_TYPE_ACTION );
+	have_type = na_gconf_utils_has_entry( provider->private->gconf, path, NAGP_ENTRY_TYPE );
+	full_path = gconf_concat_dir_and_key( path, NAGP_ENTRY_TYPE );
+	type = na_gconf_utils_read_string( provider->private->gconf, full_path, TRUE, NAGP_VALUE_TYPE_ACTION );
 	g_free( full_path );
 	item = NULL;
 
 	/* a menu has a type='Menu'
 	 */
-	if( have_type && !strcmp( type, OBJECT_ITEM_TYPE_MENU )){
+	if( have_type && !strcmp( type, NAGP_VALUE_TYPE_MENU )){
 		item = NA_OBJECT_ITEM( na_object_menu_new());
 		read_item_menu( provider, path, NA_OBJECT_MENU( item ));
 
 	/* else this should be an action (no type, or type='Action')
 	 */
-	} else if( !have_type || !strcmp( type, OBJECT_ITEM_TYPE_ACTION )){
+	} else if( !have_type || !strcmp( type, NAGP_VALUE_TYPE_ACTION )){
 		item = NA_OBJECT_ITEM( na_object_action_new());
 		read_item_action( provider, path, NA_OBJECT_ACTION( item ));
 
@@ -173,15 +172,15 @@ read_item_action( NagpGConfProvider *provider, const gchar *path, NAObjectAction
 			thisfn, ( void * ) provider, path, ( void * ) action );
 	g_return_if_fail( NA_IS_OBJECT_ACTION( action ));
 
-	uuid = na_gconf_utils_path_to_key( path );
+	uuid = g_path_get_basename( path );
 	na_object_set_id( action, uuid );
 	g_free( uuid );
 
 	entries = na_gconf_utils_get_entries( provider->private->gconf, path );
 	read_item_action_properties( provider, entries, action  );
 
-	order = na_object_item_get_items_string_list( NA_OBJECT_ITEM( action ));
-	list_profiles = get_subdirs( provider->private->gconf, path );
+	order = na_object_get_items_slist( action );
+	list_profiles = na_gconf_utils_get_subdirs( provider->private->gconf, path );
 
 	if( list_profiles ){
 
@@ -190,7 +189,7 @@ read_item_action( NagpGConfProvider *provider, const gchar *path, NAObjectAction
 		for( ip = order ; ip ; ip = ip->next ){
 			profile_path = gconf_concat_dir_and_key( path, ( gchar * ) ip->data );
 			read_item_action_profile( provider, action, profile_path );
-			list_profiles = remove_from_gslist( list_profiles, profile_path );
+			list_profiles = na_core_utils_slist_remove_string( list_profiles, profile_path );
 			g_free( profile_path );
 		}
 
@@ -210,8 +209,8 @@ read_item_action( NagpGConfProvider *provider, const gchar *path, NAObjectAction
 		read_item_action_properties_v1( provider, entries, action );
 	}
 
-	free_gslist( order );
-	free_subdirs( list_profiles );
+	na_core_utils_slist_free( order );
+	na_gconf_utils_free_subdirs( list_profiles );
 	na_gconf_utils_free_entries( entries );
 }
 
@@ -230,27 +229,27 @@ read_item_action_properties( NagpGConfProvider *provider, GSList *entries, NAObj
 
 	read_object_item_properties( provider, entries, NA_OBJECT_ITEM( action ) );
 
-	if( na_gconf_utils_get_string_from_entries( entries, ACTION_VERSION_ENTRY, &version )){
-		na_object_action_set_version( action, version );
+	if( na_gconf_utils_get_string_from_entries( entries, NAGP_ENTRY_VERSION, &version )){
+		na_object_set_version( action, version );
 		g_free( version );
 	}
 
-	if( na_gconf_utils_get_bool_from_entries( entries, OBJECT_ITEM_TARGET_SELECTION_ENTRY, &target_selection )){
-		na_object_action_set_target_selection( action, target_selection );
+	if( na_gconf_utils_get_bool_from_entries( entries, NAGP_ENTRY_TARGET_SELECTION, &target_selection )){
+		na_object_set_target_selection( action, target_selection );
 	}
 
-	if( na_gconf_utils_get_bool_from_entries( entries, OBJECT_ITEM_TARGET_BACKGROUND_ENTRY, &target_background )){
-		na_object_action_set_target_background( action, target_background );
+	if( na_gconf_utils_get_bool_from_entries( entries, NAGP_ENTRY_TARGET_BACKGROUND, &target_background )){
+		na_object_set_target_background( action, target_background );
 	}
 
-	if( na_gconf_utils_get_bool_from_entries( entries, OBJECT_ITEM_TARGET_TOOLBAR_ENTRY, &target_toolbar )){
-		na_object_action_set_target_toolbar( action, target_toolbar );
+	if( na_gconf_utils_get_bool_from_entries( entries, NAGP_ENTRY_TARGET_TOOLBAR, &target_toolbar )){
+		na_object_set_target_toolbar( action, target_toolbar );
 	}
 
 	/* toolbar label is the same that action if empty */
 	action_label = na_object_get_label( action );
 	toolbar_same_label = FALSE;
-	na_gconf_utils_get_string_from_entries( entries, OBJECT_ITEM_TOOLBAR_LABEL_ENTRY, &toolbar_label );
+	na_gconf_utils_get_string_from_entries( entries, NAGP_ENTRY_TOOLBAR_LABEL, &toolbar_label );
 	if( !toolbar_label || !g_utf8_strlen( toolbar_label, -1 ) || !g_utf8_collate( toolbar_label, action_label )){
 		toolbar_same_label = TRUE;
 	}
@@ -258,8 +257,8 @@ read_item_action_properties( NagpGConfProvider *provider, GSList *entries, NAObj
 		g_free( toolbar_label );
 		toolbar_label = g_strdup( action_label );
 	}
-	na_object_action_toolbar_set_label( action, toolbar_label );
-	na_object_action_toolbar_set_same_label( action, toolbar_same_label );
+	na_object_set_toolbar_label( action, toolbar_label );
+	na_object_set_toolbar_same_label( action, toolbar_same_label );
 	g_free( action_label );
 	g_free( toolbar_label );
 }
@@ -275,7 +274,7 @@ read_item_action_properties_v1( NagpGConfProvider *provider, GSList *entries, NA
 {
 	NAObjectProfile *profile = na_object_profile_new();
 
-	na_object_action_attach_profile( action, profile );
+	na_object_attach_profile( action, profile );
 
 	read_item_action_profile_properties( provider, entries, profile );
 }
@@ -291,7 +290,7 @@ read_item_action_profile( NagpGConfProvider *provider, NAObjectAction *action, c
 
 	profile = na_object_profile_new();
 
-	name = na_gconf_utils_path_to_key( path );
+	name = g_path_get_basename( path );
 	na_object_set_id( profile, name );
 	g_free( name );
 
@@ -299,7 +298,7 @@ read_item_action_profile( NagpGConfProvider *provider, NAObjectAction *action, c
 	read_item_action_profile_properties( provider, entries, profile );
 	na_gconf_utils_free_entries( entries );
 
-	na_object_action_attach_profile( action, profile );
+	na_object_attach_profile( action, profile );
 }
 
 static void
@@ -311,59 +310,59 @@ read_item_action_profile_properties( NagpGConfProvider *provider, GSList *entrie
 	gboolean isfile, isdir, multiple, matchcase;
 	GSList *folders;
 
-	if( na_gconf_utils_get_string_from_entries( entries, ACTION_PROFILE_LABEL_ENTRY, &label )){
+	if( na_gconf_utils_get_string_from_entries( entries, NAGP_ENTRY_PROFILE_LABEL, &label )){
 		na_object_set_label( profile, label );
 		g_free( label );
 	}
 
-	if( na_gconf_utils_get_string_from_entries( entries, ACTION_PATH_ENTRY, &path )){
-		na_object_profile_set_path( profile, path );
+	if( na_gconf_utils_get_string_from_entries( entries, NAGP_ENTRY_PATH, &path )){
+		na_object_set_path( profile, path );
 		g_free( path );
 	}
 
-	if( na_gconf_utils_get_string_from_entries( entries, ACTION_PARAMETERS_ENTRY, &parameters )){
-		na_object_profile_set_parameters( profile, parameters );
+	if( na_gconf_utils_get_string_from_entries( entries, NAGP_ENTRY_PARAMETERS, &parameters )){
+		na_object_set_parameters( profile, parameters );
 		g_free( parameters );
 	}
 
-	if( na_gconf_utils_get_string_list_from_entries( entries, ACTION_BASENAMES_ENTRY, &basenames )){
-		na_object_profile_set_basenames( profile, basenames );
-		free_gslist( basenames );
+	if( na_gconf_utils_get_string_list_from_entries( entries, NAGP_ENTRY_BASENAMES, &basenames )){
+		na_object_set_basenames( profile, basenames );
+		na_core_utils_slist_free( basenames );
 	}
 
-	if( na_gconf_utils_get_bool_from_entries( entries, ACTION_ISFILE_ENTRY, &isfile )){
-		na_object_profile_set_isfile( profile, isfile );
+	if( na_gconf_utils_get_bool_from_entries( entries, NAGP_ENTRY_ISFILE, &isfile )){
+		na_object_set_isfile( profile, isfile );
 	}
 
-	if( na_gconf_utils_get_bool_from_entries( entries, ACTION_ISDIR_ENTRY, &isdir )){
-		na_object_profile_set_isdir( profile, isdir );
+	if( na_gconf_utils_get_bool_from_entries( entries, NAGP_ENTRY_ISDIR, &isdir )){
+		na_object_set_isdir( profile, isdir );
 	}
 
-	if( na_gconf_utils_get_bool_from_entries( entries, ACTION_MULTIPLE_ENTRY, &multiple )){
-		na_object_profile_set_multiple( profile, multiple );
+	if( na_gconf_utils_get_bool_from_entries( entries, NAGP_ENTRY_MULTIPLE, &multiple )){
+		na_object_set_multiple( profile, multiple );
 	}
 
-	if( na_gconf_utils_get_string_list_from_entries( entries, ACTION_SCHEMES_ENTRY, &schemes )){
-		na_object_profile_set_schemes( profile, schemes );
-		free_gslist( schemes );
+	if( na_gconf_utils_get_string_list_from_entries( entries, NAGP_ENTRY_SCHEMES, &schemes )){
+		na_object_set_schemes( profile, schemes );
+		na_core_utils_slist_free( schemes );
 	}
 
 	/* handle matchcase+mimetypes
 	 * note that default values for 1.0 version have been set
 	 * in na_object_profile_instance_init
 	 */
-	if( na_gconf_utils_get_bool_from_entries( entries, ACTION_MATCHCASE_ENTRY, &matchcase )){
-		na_object_profile_set_matchcase( profile, matchcase );
+	if( na_gconf_utils_get_bool_from_entries( entries, NAGP_ENTRY_MATCHCASE, &matchcase )){
+		na_object_set_matchcase( profile, matchcase );
 	}
 
-	if( na_gconf_utils_get_string_list_from_entries( entries, ACTION_MIMETYPES_ENTRY, &mimetypes )){
-		na_object_profile_set_mimetypes( profile, mimetypes );
-		free_gslist( mimetypes );
+	if( na_gconf_utils_get_string_list_from_entries( entries, NAGP_ENTRY_MIMETYPES, &mimetypes )){
+		na_object_set_mimetypes( profile, mimetypes );
+		na_core_utils_slist_free( mimetypes );
 	}
 
-	if( na_gconf_utils_get_string_list_from_entries( entries, ACTION_FOLDERS_ENTRY, &folders )){
-		na_object_profile_set_folders( profile, folders );
-		free_gslist( folders );
+	if( na_gconf_utils_get_string_list_from_entries( entries, NAGP_ENTRY_FOLDERS, &folders )){
+		na_object_set_folders( profile, folders );
+		na_core_utils_slist_free( folders );
 	}
 }
 
@@ -378,7 +377,7 @@ read_item_menu( NagpGConfProvider *provider, const gchar *path, NAObjectMenu *me
 			thisfn, ( void * ) provider, path, ( void * ) menu );
 	g_return_if_fail( NA_IS_OBJECT_MENU( menu ));
 
-	uuid = na_gconf_utils_path_to_key( path );
+	uuid = g_path_get_basename( path );
 	na_object_set_id( menu, uuid );
 	g_free( uuid );
 
@@ -412,7 +411,7 @@ read_object_item_properties( NagpGConfProvider *provider, GSList *entries, NAObj
 	const gchar *key;
 	gboolean writable;
 
-	if( !na_gconf_utils_get_string_from_entries( entries, OBJECT_ITEM_LABEL_ENTRY, &label )){
+	if( !na_gconf_utils_get_string_from_entries( entries, NAGP_ENTRY_LABEL, &label )){
 		id = na_object_get_id( item );
 		g_warning( "%s: no label found for NAObjectItem %s", thisfn, id );
 		g_free( id );
@@ -421,23 +420,23 @@ read_object_item_properties( NagpGConfProvider *provider, GSList *entries, NAObj
 	na_object_set_label( item, label );
 	g_free( label );
 
-	if( na_gconf_utils_get_string_from_entries( entries, OBJECT_ITEM_TOOLTIP_ENTRY, &tooltip )){
+	if( na_gconf_utils_get_string_from_entries( entries, NAGP_ENTRY_TOOLTIP, &tooltip )){
 		na_object_set_tooltip( item, tooltip );
 		g_free( tooltip );
 	}
 
-	if( na_gconf_utils_get_string_from_entries( entries, OBJECT_ITEM_ICON_ENTRY, &icon )){
+	if( na_gconf_utils_get_string_from_entries( entries, NAGP_ENTRY_ICON, &icon )){
 		na_object_set_icon( item, icon );
 		g_free( icon );
 	}
 
-	if( na_gconf_utils_get_bool_from_entries( entries, OBJECT_ITEM_ENABLED_ENTRY, &enabled )){
+	if( na_gconf_utils_get_bool_from_entries( entries, NAGP_ENTRY_ENABLED, &enabled )){
 		na_object_set_enabled( item, enabled );
 	}
 
-	if( na_gconf_utils_get_string_list_from_entries( entries, OBJECT_ITEM_LIST_ENTRY, &subitems )){
-		na_object_item_set_items_string_list( item, subitems );
-		free_gslist( subitems );
+	if( na_gconf_utils_get_string_list_from_entries( entries, NAGP_ENTRY_ITEMS_LIST, &subitems )){
+		na_object_set_items_slist( item, subitems );
+		na_core_utils_slist_free( subitems );
 	}
 
 	writable = TRUE;
@@ -470,145 +469,3 @@ is_key_writable( NagpGConfProvider *gconf, const gchar *key )
 
 	return( is_writable );
 }
-
-/*
- * get_subdirs:
- * @gconf: a  #GConfClient instance.
- * @path: a full path to be readen.
- *
- * Returns: a GSList of full path subdirectories.
- *
- * The returned list should be na_gconf_utils_free_subdirs() by the
- * caller.
- */
-static GSList *
-get_subdirs( GConfClient *gconf, const gchar *path )
-{
-	static const gchar *thisfn = "nagp_read_get_subdirs";
-	GError *error = NULL;
-	GSList *list_subdirs;
-
-	list_subdirs = gconf_client_all_dirs( gconf, path, &error );
-
-	if( error ){
-		g_warning( "%s: path=%s, error=%s", thisfn, path, error->message );
-		g_error_free( error );
-		return(( GSList * ) NULL );
-	}
-
-	return( list_subdirs );
-}
-
-/*
- * free_subdirs:
- * @subdirs: a list of subdirs as returned by get_subdirs().
- *
- * Release the list of subdirs.
- */
-static void
-free_subdirs( GSList *subdirs )
-{
-	free_gslist( subdirs );
-}
-
-/*
- * na_gconf_utils_have_subdir:
- * @gconf: a  #GConfClient instance.
- * @path: a full path to be readen.
- *
- * Returns: %TRUE if the specified path has at least one subdirectory,
- * %FALSE else.
- */
-/*static gboolean
-na_gconf_utils_have_subdir( GConfClient *gconf, const gchar *path )
-{
-	GSList *listpath;
-	gboolean have_subdir;
-
-	listpath = get_subdirs( gconf, path );
-	have_subdir = ( listpath && g_slist_length( listpath ));
-	free_subdirs( listpath );
-
-	return( have_subdir );
-}*/
-
-/*
- * has_entry:
- * @gconf: a  #GConfClient instance.
- * @path: the full path of a key.
- * @entry: the entry to be tested.
- *
- * Returns: %TRUE if the given @entry exists for the given @path,
- * %FALSE else.
- */
-static gboolean
-has_entry( GConfClient *gconf, const gchar *path, const gchar *entry )
-{
-	static const gchar *thisfn = "has_entry";
-	gboolean have_entry = FALSE;
-	GError *error = NULL;
-	gchar *key;
-	GConfValue *value;
-
-	key = g_strdup_printf( "%s/%s", path, entry );
-
-	value = gconf_client_get_without_default( gconf, key, &error );
-
-	if( error ){
-		g_warning( "%s: key=%s, error=%s", thisfn, key, error->message );
-		g_error_free( error );
-		if( value ){
-			gconf_value_free( value );
-			value = NULL;
-		}
-	}
-
-	if( value ){
-		have_entry = TRUE;
-		gconf_value_free( value );
-	}
-
-	g_free( key );
-
-	return( have_entry );
-}
-
-/*
- * remove_from_gslist:
- * @list: the GSList to be updated.
- * @str: the string to be removed.
- *
- * Removes from the @list the item which has a string which is equal to
- * @str.
- *
- * Returns: the new @list start position.
- */
-static GSList *
-remove_from_gslist( GSList *list, const gchar *str )
-{
-	GSList *is;
-
-	for( is = list ; is ; is = is->next ){
-		const gchar *istr = ( const gchar * ) is->data;
-		if( !g_utf8_collate( str, istr )){
-			g_free( is->data );
-			list = g_slist_delete_link( list, is );
-			break;
-		}
-	}
-
-	return( list );
-}
-
-/*
- * free_gslist:
- * @list: the GSList to be freed.
- *
- * Frees a GSList of strings.
- */
-static void
-free_gslist( GSList *list )
-{
-	g_slist_foreach( list, ( GFunc ) g_free, NULL );
-	g_slist_free( list );
-}
diff --git a/src/io-gconf/nagp-read.h b/src/io-gconf/nagp-reader.h
similarity index 91%
rename from src/io-gconf/nagp-read.h
rename to src/io-gconf/nagp-reader.h
index 14a2431..6b48523 100644
--- a/src/io-gconf/nagp-read.h
+++ b/src/io-gconf/nagp-reader.h
@@ -28,10 +28,10 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __NAGP_READ_H__
-#define __NAGP_READ_H__
+#ifndef __NAGP_READER_H__
+#define __NAGP_READER_H__
 
-#include <nautilus-actions/api/na-iio-provider.h>
+#include <api/na-iio-provider.h>
 
 G_BEGIN_DECLS
 
@@ -39,4 +39,4 @@ GList *nagp_iio_provider_read_items( const NAIIOProvider *provider, GSList **mes
 
 G_END_DECLS
 
-#endif /* __NAGP_READ_H__ */
+#endif /* __NAGP_READER_H__ */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]