[nautilus-actions] na_iio_provider_load_actions renamed to na_iio_provider_read_actions

[Pierre Wieser <pwieser src gnome org>]

commit 354ef7e67f66ba74cd97746a62b0e1795f357bca
Author: Pierre Wieser <pwieser trychlos org>
Date:   Fri Jun 19 02:05:09 2009 +0200

    na_iio_provider_load_actions renamed to na_iio_provider_read_actions

 ChangeLog                    |    6 ++++++
 src/common/na-gconf.c        |    8 ++++----
 src/common/na-iio-provider.c |   10 +++++-----
 src/common/na-iio-provider.h |    5 +++--
 src/common/na-pivot.c        |    4 ++--
 5 files changed, 20 insertions(+), 13 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index a902559..732207a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,12 @@
 	* src/common/na-utils.c:
 	* src/common/na-utils.h: Renamed and updated accordingly.
 
+	* src/common/na-iio-provider.c:
+	* src/common/na-iio-provider.h:
+	* src/common/na-gconf.c:
+	* src/common/na-pivot.c:
+	na_iio_provider_load_actions renamed to na_iio_provider_read_actions.
+
 2009-06-18 Pierre Wieser <pwieser trychlos org>
 
 	Begin with porting NACT to new object hierarchy.
diff --git a/src/common/na-gconf.c b/src/common/na-gconf.c
index f6c0ed8..a662878 100644
--- a/src/common/na-gconf.c
+++ b/src/common/na-gconf.c
@@ -81,7 +81,7 @@ static void             instance_set_property( GObject *object, guint property_i
 static void             instance_dispose( GObject *object );
 static void             instance_finalize( GObject *object );
 
-static GSList          *do_load_actions( NAIIOProvider *provider );
+static GSList          *do_read_actions( NAIIOProvider *provider );
 static void             load_action_properties( NAGConf *gconf, NAAction *action );
 static GSList          *load_profiles( NAGConf *gconf, NAAction *action );
 static void             load_profile_properties( NAGConf *gconf, NAActionProfile *profile );
@@ -167,7 +167,7 @@ iio_provider_iface_init( NAIIOProviderInterface *iface )
 	static const gchar *thisfn = "na_gconf_iio_provider_iface_init";
 	g_debug( "%s: iface=%p", thisfn, iface );
 
-	iface->load_actions = do_load_actions;
+	iface->read_actions = do_read_actions;
 }
 
 static void
@@ -273,9 +273,9 @@ na_gconf_new( const GObject *handler )
  * load the list of actions and returns them as a GSList
  */
 static GSList *
-do_load_actions( NAIIOProvider *provider )
+do_read_actions( NAIIOProvider *provider )
 {
-	static const gchar *thisfn = "nacf_gconf_do_load_actions";
+	static const gchar *thisfn = "nacf_gconf_do_read_actions";
 	g_debug( "%s: provider=%p", thisfn, provider );
 
 	g_assert( NA_IS_IIO_PROVIDER( provider ));
diff --git a/src/common/na-iio-provider.c b/src/common/na-iio-provider.c
index d7892ff..aba3408 100644
--- a/src/common/na-iio-provider.c
+++ b/src/common/na-iio-provider.c
@@ -99,7 +99,7 @@ interface_base_init( NAIIOProviderInterface *klass )
 
 		klass->private = g_new0( NAIIOProviderInterfacePrivate, 1 );
 
-		klass->load_actions = NULL;
+		klass->read_actions = NULL;
 
 		initialized = TRUE;
 	}
@@ -129,9 +129,9 @@ interface_base_finalize( NAIIOProviderInterface *klass )
  * Returns a GSList of newly allocated NAAction objects.
  */
 GSList *
-na_iio_provider_load_actions( const GObject *object )
+na_iio_provider_read_actions( const GObject *object )
 {
-	static const gchar *thisfn = "na_iio_provider_load_actions";
+	static const gchar *thisfn = "na_iio_provider_read_actions";
 	g_debug( "%s", thisfn );
 
 	g_assert( NA_IS_PIVOT( object ));
@@ -148,8 +148,8 @@ na_iio_provider_load_actions( const GObject *object )
 
 		instance = NA_IIO_PROVIDER( ip->data );
 
-		if( NA_IIO_PROVIDER_GET_INTERFACE( instance )->load_actions ){
-			list = NA_IIO_PROVIDER_GET_INTERFACE( instance )->load_actions( instance );
+		if( NA_IIO_PROVIDER_GET_INTERFACE( instance )->read_actions ){
+			list = NA_IIO_PROVIDER_GET_INTERFACE( instance )->read_actions( instance );
 			actions = g_slist_concat( actions, list );
 		}
 	}
diff --git a/src/common/na-iio-provider.h b/src/common/na-iio-provider.h
index c7e72cc..656b156 100644
--- a/src/common/na-iio-provider.h
+++ b/src/common/na-iio-provider.h
@@ -60,14 +60,15 @@ typedef struct {
 	NAIIOProviderInterfacePrivate *private;
 
 	/* i/o api */
-	GSList * ( *load_actions )( NAIIOProvider *instance );
+	GSList * ( *read_actions )( NAIIOProvider *instance );
 	gboolean ( *write_action )( NAIIOProvider *instance, const GObject *action, gchar **message );
 }
 	NAIIOProviderInterface;
 
 GType    na_iio_provider_get_type( void );
 
-GSList  *na_iio_provider_load_actions( const GObject *pivot );
+GSList  *na_iio_provider_read_actions( const GObject *pivot );
+
 gboolean na_iio_provider_write_action( const GObject *pivot, const GObject *action, gchar **message );
 
 G_END_DECLS
diff --git a/src/common/na-pivot.c b/src/common/na-pivot.c
index 054b9ea..70910c7 100644
--- a/src/common/na-pivot.c
+++ b/src/common/na-pivot.c
@@ -187,7 +187,7 @@ instance_init( GTypeInstance *instance, gpointer klass )
 	self->private = g_new0( NAPivotPrivate, 1 );
 	self->private->dispose_has_run = FALSE;
 	self->private->providers = register_interface_providers( self );
-	self->private->actions = na_iio_provider_load_actions( G_OBJECT( self ));
+	self->private->actions = na_iio_provider_read_actions( G_OBJECT( self ));
 }
 
 static GSList *
@@ -497,7 +497,7 @@ on_action_changed_timeout( gpointer user_data )
 	}
 
 	free_actions( pivot->private->actions );
-	pivot->private->actions = na_iio_provider_load_actions( G_OBJECT( pivot ));
+	pivot->private->actions = na_iio_provider_read_actions( G_OBJECT( pivot ));
 
 	g_signal_emit_by_name( G_OBJECT( pivot->private->notified ), "notify_nautilus_of_action_changed" );
 	st_event_source_id = 0;