[nautilus-actions: 2/3] Getting NA (Nautilus Actions) as common objects prefix
- From: Pierre Wieser <pwieser src gnome org>
- To: svn-commits-list gnome org
- Subject: [nautilus-actions: 2/3] Getting NA (Nautilus Actions) as common objects prefix
- Date: Thu, 18 Jun 2009 19:53:27 -0400 (EDT)
commit 09219fbdbfb5b67e8ee39e77e5990f3138c16663
Author: Pierre Wieser <pwieser trychlos org>
Date: Fri Jun 19 01:54:16 2009 +0200
Getting NA (Nautilus Actions) as common objects prefix
ChangeLog | 20 ++
src/common/Makefile.am | 30 ++--
.../{nact-action-profile.c => na-action-profile.c} | 186 ++++++++--------
src/common/na-action-profile.h | 88 ++++++++
src/common/{nact-action.c => na-action.c} | 192 +++++++++---------
src/common/na-action.h | 92 ++++++++
src/common/{nact-gconf-keys.h => na-gconf-keys.h} | 8 +-
src/common/{nact-gconf.c => na-gconf.c} | 226 ++++++++++----------
src/common/{nact-gconf.h => na-gconf.h} | 40 ++--
.../{nact-iio-provider.c => na-iio-provider.c} | 72 +++---
.../{nact-iio-provider.h => na-iio-provider.h} | 36 ++--
src/common/{nact-object.c => na-object.c} | 89 ++++----
src/common/{nact-object.h => na-object.h} | 50 +++---
src/common/{nact-pivot.c => na-pivot.c} | 188 ++++++++--------
src/common/{nact-pivot.h => na-pivot.h} | 62 +++---
src/common/{nact-uti-lists.c => na-utils.c} | 6 +-
src/common/{nact-uti-lists.h => na-utils.h} | 18 +-
src/common/nact-action-profile.h | 88 --------
src/common/nact-action.h | 92 --------
src/nact/nact-application.c | 10 +-
src/nact/nact.c | 44 ++--
src/plugin/nautilus-actions.c | 59 +++---
22 files changed, 858 insertions(+), 838 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 005e898..a902559 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2009-06-19 Pierre Wieser <pwieser trychlos org>
+
+ Getting NA (Nautilus Actions) as common objects prefix.
+
+ * src/common/na-action.c:
+ * src/common/na-action.h:
+ * src/common/na-action-profile.c:
+ * src/common/na-action-profile.h:
+ * src/common/na-gconf.c:
+ * src/common/na-gconf.h:
+ * src/common/na-gconf-keys.h:
+ * src/common/na-iio-provider.c:
+ * src/common/na-iio-provider.h:
+ * src/common/na-object.c:
+ * src/common/na-object.h:
+ * src/common/na-pivot.c:
+ * src/common/na-pivot.h:
+ * src/common/na-utils.c:
+ * src/common/na-utils.h: Renamed and updated accordingly.
+
2009-06-18 Pierre Wieser <pwieser trychlos org>
Begin with porting NACT to new object hierarchy.
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 6f30488..70cabca 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -35,21 +35,21 @@ AM_CPPFLAGS += \
$(NULL)
libnact_la_SOURCES = \
- nact-action.c \
- nact-action.h \
- nact-action-profile.c \
- nact-action-profile.h \
- nact-gconf.c \
- nact-gconf.h \
- nact-gconf-keys.h \
- nact-iio-provider.c \
- nact-iio-provider.h \
- nact-object.c \
- nact-object.h \
- nact-pivot.c \
- nact-pivot.h \
- nact-uti-lists.c \
- nact-uti-lists.h \
+ na-action.c \
+ na-action.h \
+ na-action-profile.c \
+ na-action-profile.h \
+ na-gconf.c \
+ na-gconf.h \
+ na-gconf-keys.h \
+ na-iio-provider.c \
+ na-iio-provider.h \
+ na-object.c \
+ na-object.h \
+ na-pivot.c \
+ na-pivot.h \
+ na-utils.c \
+ na-utils.h \
nautilus-actions-config.c \
nautilus-actions-config.h \
nautilus-actions-config-gconf.c \
diff --git a/src/common/nact-action-profile.c b/src/common/na-action-profile.c
similarity index 83%
rename from src/common/nact-action-profile.c
rename to src/common/na-action-profile.c
index 1cffe6b..ccdbb8f 100644
--- a/src/common/nact-action-profile.c
+++ b/src/common/na-action-profile.c
@@ -36,21 +36,21 @@
#include <libnautilus-extension/nautilus-file-info.h>
-#include "nact-action.h"
-#include "nact-action-profile.h"
-#include "nact-uti-lists.h"
+#include "na-action.h"
+#include "na-action-profile.h"
+#include "na-utils.h"
/* private class data
*/
-struct NactActionProfileClassPrivate {
+struct NAActionProfileClassPrivate {
};
/* private instance data
*/
-struct NactActionProfilePrivate {
+struct NAActionProfilePrivate {
gboolean dispose_has_run;
- /* the NactAction object
+ /* the NAAction object
*/
gpointer action;
@@ -101,24 +101,24 @@ enum {
#define PROP_MIMETYPES_STR "mimetypes"
#define PROP_SCHEMES_STR "schemes"
-static NactObjectClass *st_parent_class = NULL;
+static NAObjectClass *st_parent_class = NULL;
static GType register_type( void );
-static void class_init( NactActionProfileClass *klass );
+static void class_init( NAActionProfileClass *klass );
static void instance_init( GTypeInstance *instance, gpointer klass );
static void instance_get_property( GObject *object, guint property_id, GValue *value, GParamSpec *spec );
static void instance_set_property( GObject *object, guint property_id, const GValue *value, GParamSpec *spec );
static void instance_dispose( GObject *object );
static void instance_finalize( GObject *object );
-static void do_dump( const NactObject *profile );
+static void do_dump( const NAObject *profile );
static void do_dump_list( const gchar *thisfn, const gchar *label, GSList *list );
-static gchar *do_get_id( const NactObject *object );
-static gchar *do_get_label( const NactObject *object );
+static gchar *do_get_id( const NAObject *object );
+static gchar *do_get_label( const NAObject *object );
static int validate_schemes( GSList* schemes2test, NautilusFileInfo* file );
GType
-nact_action_profile_get_type( void )
+na_action_profile_get_type( void )
{
static GType object_type = 0;
@@ -133,24 +133,24 @@ static GType
register_type( void )
{
static GTypeInfo info = {
- sizeof( NactActionProfileClass ),
+ sizeof( NAActionProfileClass ),
( GBaseInitFunc ) NULL,
( GBaseFinalizeFunc ) NULL,
( GClassInitFunc ) class_init,
NULL,
NULL,
- sizeof( NactActionProfile ),
+ sizeof( NAActionProfile ),
0,
( GInstanceInitFunc ) instance_init
};
- return( g_type_register_static( NACT_OBJECT_TYPE, "NactActionProfile", &info, 0 ));
+ return( g_type_register_static( NA_OBJECT_TYPE, "NAActionProfile", &info, 0 ));
}
static void
-class_init( NactActionProfileClass *klass )
+class_init( NAActionProfileClass *klass )
{
- static const gchar *thisfn = "nact_action_profile_class_init";
+ static const gchar *thisfn = "na_action_profile_class_init";
g_debug( "%s: klass=%p", thisfn, klass );
st_parent_class = g_type_class_peek_parent( klass );
@@ -165,7 +165,7 @@ class_init( NactActionProfileClass *klass )
spec = g_param_spec_pointer(
PROP_ACTION_STR,
PROP_ACTION_STR,
- "The NactAction object",
+ "The NAAction object",
G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE );
g_object_class_install_property( object_class, PROP_ACTION, spec );
@@ -247,31 +247,31 @@ class_init( NactActionProfileClass *klass )
G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE );
g_object_class_install_property( object_class, PROP_SCHEMES, spec );
- klass->private = g_new0( NactActionProfileClassPrivate, 1 );
+ klass->private = g_new0( NAActionProfileClassPrivate, 1 );
- NACT_OBJECT_CLASS( klass )->dump = do_dump;
- NACT_OBJECT_CLASS( klass )->get_id = do_get_id;
- NACT_OBJECT_CLASS( klass )->get_label = do_get_label;
+ NA_OBJECT_CLASS( klass )->dump = do_dump;
+ NA_OBJECT_CLASS( klass )->get_id = do_get_id;
+ NA_OBJECT_CLASS( klass )->get_label = do_get_label;
}
static void
instance_init( GTypeInstance *instance, gpointer klass )
{
- static const gchar *thisfn = "nact_action_profile_instance_init";
+ static const gchar *thisfn = "na_action_profile_instance_init";
g_debug( "%s: instance=%p, klass=%p", thisfn, instance, klass );
- g_assert( NACT_IS_ACTION_PROFILE( instance ));
- NactActionProfile* self = NACT_ACTION_PROFILE( instance );
+ g_assert( NA_IS_ACTION_PROFILE( instance ));
+ NAActionProfile* self = NA_ACTION_PROFILE( instance );
- self->private = g_new0( NactActionProfilePrivate, 1 );
+ self->private = g_new0( NAActionProfilePrivate, 1 );
self->private->dispose_has_run = FALSE;
}
static void
instance_get_property( GObject *object, guint property_id, GValue *value, GParamSpec *spec )
{
- g_assert( NACT_IS_ACTION_PROFILE( object ));
- NactActionProfile *self = NACT_ACTION_PROFILE( object );
+ g_assert( NA_IS_ACTION_PROFILE( object ));
+ NAActionProfile *self = NA_ACTION_PROFILE( object );
GSList *list;
@@ -301,7 +301,7 @@ instance_get_property( GObject *object, guint property_id, GValue *value, GParam
break;
case PROP_BASENAMES:
- list = nactuti_duplicate_string_list( self->private->basenames );
+ list = na_utils_duplicate_string_list( self->private->basenames );
g_value_set_pointer( value, list );
break;
@@ -318,12 +318,12 @@ instance_get_property( GObject *object, guint property_id, GValue *value, GParam
break;
case PROP_MIMETYPES:
- list = nactuti_duplicate_string_list( self->private->mimetypes );
+ list = na_utils_duplicate_string_list( self->private->mimetypes );
g_value_set_pointer( value, list );
break;
case PROP_SCHEMES:
- list = nactuti_duplicate_string_list( self->private->schemes );
+ list = na_utils_duplicate_string_list( self->private->schemes );
g_value_set_pointer( value, list );
break;
@@ -336,8 +336,8 @@ instance_get_property( GObject *object, guint property_id, GValue *value, GParam
static void
instance_set_property( GObject *object, guint property_id, const GValue *value, GParamSpec *spec )
{
- g_assert( NACT_IS_ACTION_PROFILE( object ));
- NactActionProfile *self = NACT_ACTION_PROFILE( object );
+ g_assert( NA_IS_ACTION_PROFILE( object ));
+ NAActionProfile *self = NA_ACTION_PROFILE( object );
switch( property_id ){
case PROP_ACTION:
@@ -369,8 +369,8 @@ instance_set_property( GObject *object, guint property_id, const GValue *value,
break;
case PROP_BASENAMES:
- nactuti_free_string_list( self->private->basenames );
- self->private->basenames = nactuti_duplicate_string_list( g_value_get_pointer( value ));
+ na_utils_free_string_list( self->private->basenames );
+ self->private->basenames = na_utils_duplicate_string_list( g_value_get_pointer( value ));
break;
case PROP_ISDIR:
@@ -386,13 +386,13 @@ instance_set_property( GObject *object, guint property_id, const GValue *value,
break;
case PROP_MIMETYPES:
- nactuti_free_string_list( self->private->mimetypes );
- self->private->mimetypes = nactuti_duplicate_string_list( g_value_get_pointer( value ));
+ na_utils_free_string_list( self->private->mimetypes );
+ self->private->mimetypes = na_utils_duplicate_string_list( g_value_get_pointer( value ));
break;
case PROP_SCHEMES:
- nactuti_free_string_list( self->private->schemes );
- self->private->schemes = nactuti_duplicate_string_list( g_value_get_pointer( value ));
+ na_utils_free_string_list( self->private->schemes );
+ self->private->schemes = na_utils_duplicate_string_list( g_value_get_pointer( value ));
break;
default:
@@ -404,11 +404,11 @@ instance_set_property( GObject *object, guint property_id, const GValue *value,
static void
instance_dispose( GObject *object )
{
- static const gchar *thisfn = "nact_action_profile_instance_dispose";
+ static const gchar *thisfn = "na_action_profile_instance_dispose";
g_debug( "%s: object=%p", thisfn, object );
- g_assert( NACT_IS_ACTION_PROFILE( object ));
- NactActionProfile *self = NACT_ACTION_PROFILE( object );
+ g_assert( NA_IS_ACTION_PROFILE( object ));
+ NAActionProfile *self = NA_ACTION_PROFILE( object );
if( !self->private->dispose_has_run ){
@@ -422,19 +422,19 @@ instance_dispose( GObject *object )
static void
instance_finalize( GObject *object )
{
- static const gchar *thisfn = "nact_action_profile_instance_finalize";
+ static const gchar *thisfn = "na_action_profile_instance_finalize";
g_debug( "%s: object=%p", thisfn, object );
- g_assert( NACT_IS_ACTION_PROFILE( object ));
- NactActionProfile *self = ( NactActionProfile * ) object;
+ g_assert( NA_IS_ACTION_PROFILE( object ));
+ NAActionProfile *self = ( NAActionProfile * ) object;
g_free( self->private->name );
g_free( self->private->label );
g_free( self->private->path );
g_free( self->private->parameters );
- nactuti_free_string_list( self->private->basenames );
- nactuti_free_string_list( self->private->mimetypes );
- nactuti_free_string_list( self->private->schemes );
+ na_utils_free_string_list( self->private->basenames );
+ na_utils_free_string_list( self->private->mimetypes );
+ na_utils_free_string_list( self->private->schemes );
/* chain call to parent class */
if((( GObjectClass * ) st_parent_class )->finalize ){
@@ -449,17 +449,17 @@ instance_finalize( GObject *object )
*
* @name: the internal name (identifier) of the profile.
*
- * Returns the newly allocated NactActionProfile object.
+ * Returns the newly allocated NAActionProfile object.
*/
-NactActionProfile *
-nact_action_profile_new( const NactObject *action, const gchar *name )
+NAActionProfile *
+na_action_profile_new( const NAObject *action, const gchar *name )
{
- g_assert( NACT_IS_ACTION( action ));
+ g_assert( NA_IS_ACTION( action ));
g_assert( name && strlen( name ));
- NactActionProfile *profile =
+ NAActionProfile *profile =
g_object_new(
- NACT_ACTION_PROFILE_TYPE,
+ NA_ACTION_PROFILE_TYPE,
PROP_ACTION_STR, action, PROP_PROFILE_NAME_STR, name, NULL );
return( profile );
@@ -470,18 +470,18 @@ nact_action_profile_new( const NactObject *action, const gchar *name )
*
* @profile: the profile to be duplicated.
*
- * Returns the newly allocated NactActionProfile object.
+ * Returns the newly allocated NAActionProfile object.
*
* Note the duplicated profile has the same internal name (identifier)
* as the initial one, and thus cannot be attached to the same action.
*/
-NactActionProfile *
-nact_action_profile_copy( const NactActionProfile *profile )
+NAActionProfile *
+na_action_profile_copy( const NAActionProfile *profile )
{
- g_assert( NACT_IS_ACTION_PROFILE( profile ));
+ g_assert( NA_IS_ACTION_PROFILE( profile ));
- NactActionProfile *new =
- nact_action_profile_new( profile->private->action, profile->private->name );
+ NAActionProfile *new =
+ na_action_profile_new( profile->private->action, profile->private->name );
g_object_set( G_OBJECT( new ),
PROP_LABEL_STR, profile->private->label,
@@ -502,22 +502,22 @@ nact_action_profile_copy( const NactActionProfile *profile )
/**
* Frees a profile.
*
- * @profile: the NactActionProfile object to be freed.
+ * @profile: the NAActionProfile object to be freed.
*/
void
-nact_action_profile_free( NactActionProfile *profile )
+na_action_profile_free( NAActionProfile *profile )
{
- g_assert( NACT_IS_ACTION_PROFILE( profile ));
+ g_assert( NA_IS_ACTION_PROFILE( profile ));
g_object_unref( profile );
}
static void
-do_dump( const NactObject *object )
+do_dump( const NAObject *object )
{
- static const gchar *thisfn = "nact_action_profile_do_dump";
+ static const gchar *thisfn = "na_action_profile_do_dump";
- g_assert( NACT_IS_ACTION_PROFILE( object ));
- NactActionProfile *self = NACT_ACTION_PROFILE( object );
+ g_assert( NA_IS_ACTION_PROFILE( object ));
+ NAActionProfile *self = NA_ACTION_PROFILE( object );
if( st_parent_class->dump ){
st_parent_class->dump( object );
@@ -554,9 +554,9 @@ do_dump_list( const gchar *thisfn, const gchar *label, GSList *list )
}
static gchar *
-do_get_id( const NactObject *profile )
+do_get_id( const NAObject *profile )
{
- g_assert( NACT_IS_ACTION_PROFILE( profile ));
+ g_assert( NA_IS_ACTION_PROFILE( profile ));
gchar *name;
g_object_get( G_OBJECT( profile ), PROP_PROFILE_NAME_STR, &name, NULL );
@@ -567,21 +567,21 @@ do_get_id( const NactObject *profile )
/**
* Returns the internal name (identifier) of the profile.
*
- * @action: an NactActionProfile object.
+ * @action: an NAActionProfile object.
*
* The returned string must be g_freed by the caller.
*/
gchar *
-nact_action_profile_get_name( const NactActionProfile *profile )
+na_action_profile_get_name( const NAActionProfile *profile )
{
- g_assert( NACT_IS_ACTION_PROFILE( profile ));
- return( nact_object_get_id( NACT_OBJECT( profile )));
+ g_assert( NA_IS_ACTION_PROFILE( profile ));
+ return( na_object_get_id( NA_OBJECT( profile )));
}
static gchar *
-do_get_label( const NactObject *profile )
+do_get_label( const NAObject *profile )
{
- g_assert( NACT_IS_ACTION_PROFILE( profile ));
+ g_assert( NA_IS_ACTION_PROFILE( profile ));
gchar *label;
g_object_get( G_OBJECT( profile ), PROP_LABEL_STR, &label, NULL );
@@ -592,49 +592,49 @@ do_get_label( const NactObject *profile )
/**
* Returns the descriptive name (label) of the profile.
*
- * @action: an NactAction object.
+ * @action: an NAAction object.
*
* The returned string must be g_freed by the caller.
*/
gchar *
-nact_action_profile_get_label( const NactActionProfile *profile )
+na_action_profile_get_label( const NAActionProfile *profile )
{
- g_assert( NACT_IS_ACTION_PROFILE( profile ));
- return( nact_object_get_label( NACT_OBJECT( profile )));
+ g_assert( NA_IS_ACTION_PROFILE( profile ));
+ return( na_object_get_label( NA_OBJECT( profile )));
}
/**
* Returns a pointer to the action for this profile.
*
- * @profile: the NactActionProfile object whose parent action is to be
+ * @profile: the NAActionProfile object whose parent action is to be
* retrieved.
*
* Note that the returned NactNaction is owned by the profile. The
* caller should not try to free or unref it.
*/
-NactObject *
-nact_action_profile_get_action( const NactActionProfile *profile )
+NAObject *
+na_action_profile_get_action( const NAActionProfile *profile )
{
- g_assert( NACT_IS_ACTION_PROFILE( profile ));
+ g_assert( NA_IS_ACTION_PROFILE( profile ));
gpointer action;
g_object_get( G_OBJECT( profile ), PROP_ACTION_STR, &action, NULL );
- return( NACT_OBJECT( action ));
+ return( NA_OBJECT( action ));
}
/**
* Returns the path of the command in the profile.
*
- * @profile: the NactActionProfile object whose command path is to be
+ * @profile: the NAActionProfile object whose command path is to be
* retrieved.
*
* The returned string should be g_freed by the caller.
*/
gchar *
-nact_action_profile_get_path( const NactActionProfile *profile )
+na_action_profile_get_path( const NAActionProfile *profile )
{
- g_assert( NACT_IS_ACTION_PROFILE( profile ));
+ g_assert( NA_IS_ACTION_PROFILE( profile ));
gchar *path;
g_object_get( G_OBJECT( profile ), PROP_PATH_STR, &path, NULL );
@@ -645,15 +645,15 @@ nact_action_profile_get_path( const NactActionProfile *profile )
/**
* Returns the parameters of the command in the profile.
*
- * @profile: the NactActionProfile object whose command parameters are
+ * @profile: the NAActionProfile object whose command parameters are
* to be retrieved.
*
* The returned string should be g_freed by the caller.
*/
gchar *
-nact_action_profile_get_parameters( const NactActionProfile *profile )
+na_action_profile_get_parameters( const NAActionProfile *profile )
{
- g_assert( NACT_IS_ACTION_PROFILE( profile ));
+ g_assert( NA_IS_ACTION_PROFILE( profile ));
gchar *parameters;
g_object_get( G_OBJECT( profile ), PROP_PARAMETERS_STR, ¶meters, NULL );
@@ -696,7 +696,7 @@ validate_schemes( GSList* schemes2test, NautilusFileInfo* file )
* @files: the list currently selected items, as provided by Nautilus.
*/
gboolean
-nact_action_profile_is_candidate( const NactActionProfile *profile, GList* files )
+na_action_profile_is_candidate( const NAActionProfile *profile, GList* files )
{
gboolean retv = FALSE;
gboolean test_multiple_file = FALSE;
@@ -933,7 +933,7 @@ nact_action_profile_is_candidate( const NactActionProfile *profile, GList* files
* %% : a percent sign
*/
gchar *
-nact_action_profile_parse_parameters( const NactActionProfile *profile, GList* files )
+na_action_profile_parse_parameters( const NAActionProfile *profile, GList* files )
{
gchar *parsed = NULL;
GString *string;
@@ -950,7 +950,7 @@ nact_action_profile_parse_parameters( const NactActionProfile *profile, GList* f
GString *basename_list, *pathname_list;
gchar *tmp;
- g_return_val_if_fail( NACT_IS_ACTION_PROFILE( profile ), NULL );
+ g_return_val_if_fail( NA_IS_ACTION_PROFILE( profile ), NULL );
string = g_string_new( "" );
basename_list = g_string_new( "" );
diff --git a/src/common/na-action-profile.h b/src/common/na-action-profile.h
new file mode 100644
index 0000000..e21c2a1
--- /dev/null
+++ b/src/common/na-action-profile.h
@@ -0,0 +1,88 @@
+/*
+ * Nautilus Actions
+ * A Nautilus extension which offers configurable context menu actions.
+ *
+ * Copyright (C) 2005 The GNOME Foundation
+ * Copyright (C) 2006, 2007, 2008 Frederic Ruaudel and others (see AUTHORS)
+ * Copyright (C) 2009 Pierre Wieser and others (see AUTHORS)
+ *
+ * This Program 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.
+ *
+ * This Program 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 this Library; see the file COPYING. If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place,
+ * Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors:
+ * Frederic Ruaudel <grumz grumz net>
+ * Rodrigo Moya <rodrigo gnome-db org>
+ * Pierre Wieser <pwieser trychlos org>
+ * ... and many others (see AUTHORS)
+ */
+
+#ifndef __NA_ACTION_PROFILE_H__
+#define __NA_ACTION_PROFILE_H__
+
+/*
+ * NactActionProfile class definition.
+ *
+ * This is a companion class of NactAction. It embeds the profile
+ * definition of an action.
+ *
+ * As NactAction itself, NactActionProfile class is derived from
+ * NAObject which takes care of i/o.
+ */
+
+#include "na-object.h"
+
+G_BEGIN_DECLS
+
+#define NA_ACTION_PROFILE_TYPE ( na_action_profile_get_type())
+#define NA_ACTION_PROFILE( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NA_ACTION_PROFILE_TYPE, NAActionProfile ))
+#define NA_ACTION_PROFILE_CLASS( klass ) ( G_TYPE_CHECK_CLASS_CAST( klass, NA_ACTION_PROFILE_TYPE, NAActionProfileClass ))
+#define NA_IS_ACTION_PROFILE( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NA_ACTION_PROFILE_TYPE ))
+#define NA_IS_ACTION_PROFILE_CLASS( klass ) ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NA_ACTION_PROFILE_TYPE ))
+#define NA_ACTION_PROFILE_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NA_ACTION_PROFILE_TYPE, NAActionProfileClass ))
+
+typedef struct NAActionProfilePrivate NAActionProfilePrivate;
+
+typedef struct {
+ NAObject parent;
+ NAActionProfilePrivate *private;
+}
+ NAActionProfile;
+
+typedef struct NAActionProfileClassPrivate NAActionProfileClassPrivate;
+
+typedef struct {
+ NAObjectClass parent;
+ NAActionProfileClassPrivate *private;
+}
+ NAActionProfileClass;
+
+GType na_action_profile_get_type( void );
+
+NAActionProfile *na_action_profile_new( const NAObject *action, const gchar *name );
+NAActionProfile *na_action_profile_copy( const NAActionProfile *profile );
+void na_action_profile_free( NAActionProfile *profile );
+
+NAObject *na_action_profile_get_action( const NAActionProfile *profile );
+gchar *na_action_profile_get_name( const NAActionProfile *profile );
+gchar *na_action_profile_get_label( const NAActionProfile *profile );
+gchar *na_action_profile_get_path( const NAActionProfile *profile );
+gchar *na_action_profile_get_parameters( const NAActionProfile *profile );
+
+gboolean na_action_profile_is_candidate( const NAActionProfile *profile, GList *files );
+gchar *na_action_profile_parse_parameters( const NAActionProfile *profile, GList *files );
+
+G_END_DECLS
+
+#endif /* __NA_ACTION_PROFILE_H__ */
diff --git a/src/common/nact-action.c b/src/common/na-action.c
similarity index 71%
rename from src/common/nact-action.c
rename to src/common/na-action.c
index 95f6bd2..02b72d4 100644
--- a/src/common/nact-action.c
+++ b/src/common/na-action.c
@@ -35,18 +35,18 @@
#include <string.h>
#include <uuid/uuid.h>
-#include "nact-action.h"
-#include "nact-action-profile.h"
-#include "nact-uti-lists.h"
+#include "na-action.h"
+#include "na-action-profile.h"
+#include "na-utils.h"
/* private class data
*/
-struct NactActionClassPrivate {
+struct NAActionClassPrivate {
};
/* private instance data
*/
-struct NactActionPrivate {
+struct NAActionPrivate {
gboolean dispose_has_run;
/* action properties
@@ -57,7 +57,7 @@ struct NactActionPrivate {
gchar *tooltip;
gchar *icon;
- /* list of action's profiles as NactActionProfile objects
+ /* list of action's profiles as NAActionProfile objects
* (thanks, Frederic ;-))
*/
GSList *profiles;
@@ -81,24 +81,24 @@ enum {
#define PROP_TOOLTIP_STR "tooltip"
#define PROP_ICON_STR "icon"
-static NactObjectClass *st_parent_class = NULL;
+static NAObjectClass *st_parent_class = NULL;
static GType register_type( void );
-static void class_init( NactActionClass *klass );
+static void class_init( NAActionClass *klass );
static void instance_init( GTypeInstance *instance, gpointer klass );
static void instance_get_property( GObject *object, guint property_id, GValue *value, GParamSpec *spec );
static void instance_set_property( GObject *object, guint property_id, const GValue *value, GParamSpec *spec );
static void instance_dispose( GObject *object );
static void instance_finalize( GObject *object );
-static void do_dump( const NactObject *action );
-static gchar *do_get_id( const NactObject *action );
-static gchar *do_get_label( const NactObject *action );
+static void do_dump( const NAObject *action );
+static gchar *do_get_id( const NAObject *action );
+static gchar *do_get_label( const NAObject *action );
-static void free_profiles( NactAction *action );
+static void free_profiles( NAAction *action );
GType
-nact_action_get_type( void )
+na_action_get_type( void )
{
static GType action_type = 0;
@@ -113,24 +113,24 @@ static GType
register_type( void )
{
static GTypeInfo info = {
- sizeof( NactActionClass ),
+ sizeof( NAActionClass ),
( GBaseInitFunc ) NULL,
( GBaseFinalizeFunc ) NULL,
( GClassInitFunc ) class_init,
NULL,
NULL,
- sizeof( NactAction ),
+ sizeof( NAAction ),
0,
( GInstanceInitFunc ) instance_init
};
- return( g_type_register_static( NACT_OBJECT_TYPE, "NactAction", &info, 0 ));
+ return( g_type_register_static( NA_OBJECT_TYPE, "NAAction", &info, 0 ));
}
static void
-class_init( NactActionClass *klass )
+class_init( NAActionClass *klass )
{
- static const gchar *thisfn = "nact_action_class_init";
+ static const gchar *thisfn = "na_action_class_init";
g_debug( "%s: klass=%p", thisfn, klass );
st_parent_class = g_type_class_peek_parent( klass );
@@ -179,31 +179,31 @@ class_init( NactActionClass *klass )
G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE );
g_object_class_install_property( object_class, PROP_ICON, spec );
- klass->private = g_new0( NactActionClassPrivate, 1 );
+ klass->private = g_new0( NAActionClassPrivate, 1 );
- NACT_OBJECT_CLASS( klass )->dump = do_dump;
- NACT_OBJECT_CLASS( klass )->get_id = do_get_id;
- NACT_OBJECT_CLASS( klass )->get_label = do_get_label;
+ NA_OBJECT_CLASS( klass )->dump = do_dump;
+ NA_OBJECT_CLASS( klass )->get_id = do_get_id;
+ NA_OBJECT_CLASS( klass )->get_label = do_get_label;
}
static void
instance_init( GTypeInstance *instance, gpointer klass )
{
- /*static const gchar *thisfn = "nact_action_instance_init";
+ /*static const gchar *thisfn = "na_action_instance_init";
g_debug( "%s: instance=%p, klass=%p", thisfn, instance, klass );*/
- g_assert( NACT_IS_ACTION( instance ));
- NactAction* self = NACT_ACTION( instance );
+ g_assert( NA_IS_ACTION( instance ));
+ NAAction* self = NA_ACTION( instance );
- self->private = g_new0( NactActionPrivate, 1 );
+ self->private = g_new0( NAActionPrivate, 1 );
self->private->dispose_has_run = FALSE;
}
static void
instance_get_property( GObject *object, guint property_id, GValue *value, GParamSpec *spec )
{
- g_assert( NACT_IS_ACTION( object ));
- NactAction *self = NACT_ACTION( object );
+ g_assert( NA_IS_ACTION( object ));
+ NAAction *self = NA_ACTION( object );
switch( property_id ){
case PROP_UUID:
@@ -235,8 +235,8 @@ instance_get_property( GObject *object, guint property_id, GValue *value, GParam
static void
instance_set_property( GObject *object, guint property_id, const GValue *value, GParamSpec *spec )
{
- g_assert( NACT_IS_ACTION( object ));
- NactAction *self = NACT_ACTION( object );
+ g_assert( NA_IS_ACTION( object ));
+ NAAction *self = NA_ACTION( object );
switch( property_id ){
case PROP_UUID:
@@ -273,11 +273,11 @@ instance_set_property( GObject *object, guint property_id, const GValue *value,
static void
instance_dispose( GObject *object )
{
- static const gchar *thisfn = "nact_action_instance_dispose";
+ static const gchar *thisfn = "na_action_instance_dispose";
g_debug( "%s: object=%p", thisfn, object );
- g_assert( NACT_IS_ACTION( object ));
- NactAction *self = NACT_ACTION( object );
+ g_assert( NA_IS_ACTION( object ));
+ NAAction *self = NA_ACTION( object );
if( !self->private->dispose_has_run ){
@@ -294,11 +294,11 @@ instance_dispose( GObject *object )
static void
instance_finalize( GObject *object )
{
- static const gchar *thisfn = "nact_action_instance_finalize";
+ static const gchar *thisfn = "na_action_instance_finalize";
g_debug( "%s: object=%p", thisfn, object );
- g_assert( NACT_IS_ACTION( object ));
- NactAction *self = ( NactAction * ) object;
+ g_assert( NA_IS_ACTION( object ));
+ NAAction *self = ( NAAction * ) object;
g_free( self->private->uuid );
g_free( self->private->version );
@@ -313,37 +313,37 @@ instance_finalize( GObject *object )
}
/**
- * Allocates a new NactAction object.
+ * Allocates a new NAAction object.
*
* @uuid: the globally unique identifier (UUID) of the action.
*
- * Return a newly allocated NactAction object.
+ * Return a newly allocated NAAction object.
*/
-NactAction *
-nact_action_new( const gchar *uuid )
+NAAction *
+na_action_new( const gchar *uuid )
{
- NactAction *action = g_object_new( NACT_ACTION_TYPE, PROP_UUID_STR, uuid, NULL );
+ NAAction *action = g_object_new( NA_ACTION_TYPE, PROP_UUID_STR, uuid, NULL );
return( action );
}
/**
- * Allocates a new NactAction object, and initializes it as an exact
+ * Allocates a new NAAction object, and initializes it as an exact
* copy of the specified action.
*
* @action: the action to be duplicated.
*
- * Return a newly allocated NactAction object.
+ * Return a newly allocated NAAction object.
*
* Please note than "an exact copy" here means that the newly allocated
* returned object has the _same_ UUID than the original one.
*/
-NactAction *
-nact_action_duplicate( const NactAction *action )
+NAAction *
+na_action_duplicate( const NAAction *action )
{
- g_assert( NACT_IS_ACTION( action ));
+ g_assert( NA_IS_ACTION( action ));
- gchar *uuid = do_get_id( NACT_OBJECT( action ));
- NactAction *duplicate = g_object_new( NACT_ACTION_TYPE, PROP_UUID_STR, uuid, NULL );
+ gchar *uuid = do_get_id( NA_OBJECT( action ));
+ NAAction *duplicate = g_object_new( NA_ACTION_TYPE, PROP_UUID_STR, uuid, NULL );
g_free( uuid );
duplicate->private->version = g_strdup( action->private->version );
@@ -360,12 +360,12 @@ nact_action_duplicate( const NactAction *action )
}
static void
-do_dump( const NactObject *action )
+do_dump( const NAObject *action )
{
- static const gchar *thisfn = "nact_action_do_dump";
+ static const gchar *thisfn = "na_action_do_dump";
- g_assert( NACT_IS_ACTION( action ));
- NactAction *self = NACT_ACTION( action );
+ g_assert( NA_IS_ACTION( action ));
+ NAAction *self = NA_ACTION( action );
if( st_parent_class->dump ){
st_parent_class->dump( action );
@@ -378,17 +378,17 @@ do_dump( const NactObject *action )
g_debug( "%s: icon='%s'", thisfn, self->private->icon );
/* dump profiles */
- g_debug( "%s: %d profile(s) at %p", thisfn, nact_action_get_profiles_count( self ), self->private->profiles );
+ g_debug( "%s: %d profile(s) at %p", thisfn, na_action_get_profiles_count( self ), self->private->profiles );
GSList *item;
for( item = self->private->profiles ; item != NULL ; item = item->next ){
- nact_object_dump(( const NactObject * ) item->data );
+ na_object_dump(( const NAObject * ) item->data );
}
}
static gchar *
-do_get_id( const NactObject *action )
+do_get_id( const NAObject *action )
{
- g_assert( NACT_IS_ACTION( action ));
+ g_assert( NA_IS_ACTION( action ));
gchar *uuid;
g_object_get( G_OBJECT( action ), PROP_UUID_STR, &uuid, NULL );
@@ -399,21 +399,21 @@ do_get_id( const NactObject *action )
/**
* Returns the globally unique identifier (UUID) of the action.
*
- * @action: an NactAction object.
+ * @action: an NAAction object.
*
* The returned string must be g_freed by the caller.
*/
gchar *
-nact_action_get_uuid( const NactAction *action )
+na_action_get_uuid( const NAAction *action )
{
- g_assert( NACT_IS_ACTION( action ));
- return( nact_object_get_id( NACT_OBJECT( action )));
+ g_assert( NA_IS_ACTION( action ));
+ return( na_object_get_id( NA_OBJECT( action )));
}
/**
* Returns the version attached to the action.
*
- * @action: an NactAction object.
+ * @action: an NAAction object.
*
* The returned string must be g_freed by the caller.
*
@@ -422,9 +422,9 @@ nact_action_get_uuid( const NactAction *action )
* returned version is also the latest.
*/
gchar *
-nact_action_get_version( const NactAction *action )
+na_action_get_version( const NAAction *action )
{
- g_assert( NACT_IS_ACTION( action ));
+ g_assert( NA_IS_ACTION( action ));
gchar *version;
g_object_get( G_OBJECT( action ), PROP_VERSION_STR, &version, NULL );
@@ -433,9 +433,9 @@ nact_action_get_version( const NactAction *action )
}
static gchar *
-do_get_label( const NactObject *action )
+do_get_label( const NAObject *action )
{
- g_assert( NACT_IS_ACTION( action ));
+ g_assert( NA_IS_ACTION( action ));
gchar *label;
g_object_get( G_OBJECT( action ), PROP_LABEL_STR, &label, NULL );
@@ -446,29 +446,29 @@ do_get_label( const NactObject *action )
/**
* Returns the label of the action.
*
- * @action: an NactAction object.
+ * @action: an NAAction object.
*
* The returned string must be g_freed by the caller.
*/
gchar *
-nact_action_get_label( const NactAction *action )
+na_action_get_label( const NAAction *action )
{
- g_assert( NACT_IS_ACTION( action ));
- return( nact_object_get_label( NACT_OBJECT( action )));
+ g_assert( NA_IS_ACTION( action ));
+ return( na_object_get_label( NA_OBJECT( action )));
}
/**
* Returns the tooltip attached to the context menu item for the
* action.
*
- * @action: an NactAction object.
+ * @action: an NAAction object.
*
* The returned string must be g_freed by the caller.
*/
gchar *
-nact_action_get_tooltip( const NactAction *action )
+na_action_get_tooltip( const NAAction *action )
{
- g_assert( NACT_IS_ACTION( action ));
+ g_assert( NA_IS_ACTION( action ));
gchar *tooltip;
g_object_get( G_OBJECT( action ), PROP_TOOLTIP_STR, &tooltip, NULL );
@@ -480,14 +480,14 @@ nact_action_get_tooltip( const NactAction *action )
* Returns the name of the icon attached to the context menu item for
* the action.
*
- * @action: an NactAction object.
+ * @action: an NAAction object.
*
* The returned string must be g_freed by the caller.
*/
gchar *
-nact_action_get_icon( const NactAction *action )
+na_action_get_icon( const NAAction *action )
{
- g_assert( NACT_IS_ACTION( action ));
+ g_assert( NA_IS_ACTION( action ));
gchar *icon;
g_object_get( G_OBJECT( action ), PROP_ICON_STR, &icon, NULL );
@@ -499,14 +499,14 @@ nact_action_get_icon( const NactAction *action )
* Returns the icon name attached to the context menu item for the
* action.
*
- * @action: an NactAction object.
+ * @action: an NAAction object.
*
* When not NULL, the returned string must be g_free by the caller.
*/
gchar *
-nact_action_get_verified_icon_name( const NactAction *action )
+na_action_get_verified_icon_name( const NAAction *action )
{
- g_assert( NACT_IS_ACTION( action ));
+ g_assert( NA_IS_ACTION( action ));
gchar *icon_name;
g_object_get( G_OBJECT( action ), PROP_ICON_STR, &icon_name, NULL );
@@ -530,9 +530,9 @@ nact_action_get_verified_icon_name( const NactAction *action )
* @action: action whose UUID is to be set.
*/
void
-nact_action_set_new_uuid( NactAction *action )
+na_action_set_new_uuid( NAAction *action )
{
- g_assert( NACT_IS_ACTION( action ));
+ g_assert( NA_IS_ACTION( action ));
uuid_t uuid;
gchar uuid_str[64];
@@ -544,7 +544,7 @@ nact_action_set_new_uuid( NactAction *action )
/**
* Returns the list of profiles of the actions as a GSList of
- * NactActionProfile GObjects.
+ * NAActionProfile GObjects.
*
* @action: the action whose profiles has to be retrieved.
*
@@ -552,9 +552,9 @@ nact_action_set_new_uuid( NactAction *action )
* should not try to free or unref it.
*/
GSList *
-nact_action_get_profiles( const NactAction *action )
+na_action_get_profiles( const NAAction *action )
{
- g_assert( NACT_IS_ACTION( action ));
+ g_assert( NA_IS_ACTION( action ));
return( action->private->profiles );
}
@@ -564,23 +564,23 @@ nact_action_get_profiles( const NactAction *action )
*
* @action: the action whose profiles has to be retrieved.
*
- * @list: a list of NactActionProfile objects to be installed in the
+ * @list: a list of NAActionProfile objects to be installed in the
* action.
*
* The provided list is copied to the action, and thus can then be
- * safely freed (see nact_action_free_profiles) by the caller.
+ * safely freed (see na_action_free_profiles) by the caller.
*/
void
-nact_action_set_profiles( NactAction *action, GSList *list )
+na_action_set_profiles( NAAction *action, GSList *list )
{
- g_assert( NACT_IS_ACTION( action ));
+ g_assert( NA_IS_ACTION( action ));
free_profiles( action );
GSList *ip;
for( ip = list ; ip ; ip = ip->next ){
action->private->profiles = g_slist_prepend(
action->private->profiles,
- nact_action_profile_copy( NACT_ACTION_PROFILE( ip->data ))
+ na_action_profile_copy( NA_ACTION_PROFILE( ip->data ))
);
}
}
@@ -591,19 +591,19 @@ nact_action_set_profiles( NactAction *action, GSList *list )
* @action: the action whose profiles has to be retrieved.
*/
guint
-nact_action_get_profiles_count( const NactAction *action )
+na_action_get_profiles_count( const NAAction *action )
{
- g_assert( NACT_IS_ACTION( action ));
+ g_assert( NA_IS_ACTION( action ));
return( g_slist_length( action->private->profiles ));
}
static void
-free_profiles( NactAction *action )
+free_profiles( NAAction *action )
{
- g_assert( NACT_IS_ACTION( action ));
+ g_assert( NA_IS_ACTION( action ));
- nact_action_free_profiles( action->private->profiles );
+ na_action_free_profiles( action->private->profiles );
action->private->profiles = NULL;
}
@@ -611,14 +611,14 @@ free_profiles( NactAction *action )
/**
* Frees a profiles list.
*
- * @list: a list of NactActionProfile objects.
+ * @list: a list of NAActionProfile objects.
*/
void
-nact_action_free_profiles( GSList * list )
+na_action_free_profiles( GSList * list )
{
GSList *ip;
for( ip = list ; ip ; ip = ip->next ){
- g_object_unref( NACT_ACTION_PROFILE( ip->data ));
+ g_object_unref( NA_ACTION_PROFILE( ip->data ));
}
g_slist_free( list );
}
diff --git a/src/common/na-action.h b/src/common/na-action.h
new file mode 100644
index 0000000..7a5bdaa
--- /dev/null
+++ b/src/common/na-action.h
@@ -0,0 +1,92 @@
+/*
+ * Nautilus Actions
+ * A Nautilus extension which offers configurable context menu actions.
+ *
+ * Copyright (C) 2005 The GNOME Foundation
+ * Copyright (C) 2006, 2007, 2008 Frederic Ruaudel and others (see AUTHORS)
+ * Copyright (C) 2009 Pierre Wieser and others (see AUTHORS)
+ *
+ * This Program 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.
+ *
+ * This Program 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 this Library; see the file COPYING. If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place,
+ * Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors:
+ * Frederic Ruaudel <grumz grumz net>
+ * Rodrigo Moya <rodrigo gnome-db org>
+ * Pierre Wieser <pwieser trychlos org>
+ * ... and many others (see AUTHORS)
+ */
+
+#ifndef __NA_ACTION_H__
+#define __NA_ACTION_H__
+
+/*
+ * NAAction class definition.
+ *
+ * This is the class which maintains an action.
+ *
+ * NAAction class is derived from NAObject.
+ */
+
+#include "na-object.h"
+#include "na-pivot.h"
+
+G_BEGIN_DECLS
+
+#define NA_ACTION_TYPE ( na_action_get_type())
+#define NA_ACTION( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NA_ACTION_TYPE, NAAction ))
+#define NA_ACTION_CLASS( klass ) ( G_TYPE_CHECK_CLASS_CAST( klass, NA_ACTION_TYPE, NAActionClass ))
+#define NA_IS_ACTION( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NA_ACTION_TYPE ))
+#define NA_IS_ACTION_CLASS( klass ) ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NA_ACTION_TYPE ))
+#define NA_ACTION_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NA_ACTION_TYPE, NAActionClass ))
+
+typedef struct NAActionPrivate NAActionPrivate;
+
+typedef struct {
+ NAObject parent;
+ NAActionPrivate *private;
+}
+ NAAction;
+
+typedef struct NAActionClassPrivate NAActionClassPrivate;
+
+typedef struct {
+ NAObjectClass parent;
+ NAActionClassPrivate *private;
+}
+ NAActionClass;
+
+GType na_action_get_type( void );
+
+NAAction *na_action_new( const gchar *uuid );
+NAAction *na_action_duplicate( const NAAction *action );
+
+gchar *na_action_get_uuid( const NAAction *action );
+gchar *na_action_get_version( const NAAction *action );
+gchar *na_action_get_label( const NAAction *action );
+gchar *na_action_get_tooltip( const NAAction *action );
+gchar *na_action_get_icon( const NAAction *action );
+gchar *na_action_get_verified_icon_name( const NAAction *action );
+
+void na_action_set_new_uuid( NAAction *action );
+
+GSList *na_action_get_profiles( const NAAction *action );
+void na_action_set_profiles( NAAction *action, GSList *list );
+void na_action_free_profiles( GSList *list );
+
+guint na_action_get_profiles_count( const NAAction *action );
+
+G_END_DECLS
+
+#endif /* __NA_ACTION_H__ */
diff --git a/src/common/nact-gconf-keys.h b/src/common/na-gconf-keys.h
similarity index 87%
rename from src/common/nact-gconf-keys.h
rename to src/common/na-gconf-keys.h
index 365c95b..92703e5 100644
--- a/src/common/nact-gconf-keys.h
+++ b/src/common/na-gconf-keys.h
@@ -28,10 +28,10 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __NACT_GCONF_KEYS_H__
-#define __NACT_GCONF_KEYS_H__
+#ifndef __NA_GCONF_KEYS_H__
+#define __NA_GCONF_KEYS_H__
/* GConf general information */
-#define NACT_GCONF_CONFIG_PATH NAUTILUS_ACTIONS_CONFIG_GCONF_BASEDIR "/configurations"
+#define NA_GCONF_CONFIG_PATH NAUTILUS_ACTIONS_CONFIG_GCONF_BASEDIR "/configurations"
-#endif /* __NACT_GCONF_KEYS_H__ */
+#endif /* __NA_GCONF_KEYS_H__ */
diff --git a/src/common/nact-gconf.c b/src/common/na-gconf.c
similarity index 69%
rename from src/common/nact-gconf.c
rename to src/common/na-gconf.c
index 5c6e3b2..f6c0ed8 100644
--- a/src/common/nact-gconf.c
+++ b/src/common/na-gconf.c
@@ -37,21 +37,21 @@
#include <gconf/gconf.h>
#include <gconf/gconf-client.h>
-#include "nact-action.h"
-#include "nact-action-profile.h"
-#include "nact-gconf.h"
-#include "nact-gconf-keys.h"
-#include "nact-iio-provider.h"
-#include "nact-uti-lists.h"
+#include "na-action.h"
+#include "na-action-profile.h"
+#include "na-gconf.h"
+#include "na-gconf-keys.h"
+#include "na-iio-provider.h"
+#include "na-utils.h"
/* private class data
*/
-struct NactGConfClassPrivate {
+struct NAGConfClassPrivate {
};
/* private instance data
*/
-struct NactGConfPrivate {
+struct NAGConfPrivate {
gboolean dispose_has_run;
/* instance to be notified of an action modification
@@ -73,31 +73,31 @@ enum {
static GObjectClass *st_parent_class = NULL;
static GType register_type( void );
-static void class_init( NactGConfClass *klass );
-static void iio_provider_iface_init( NactIIOProviderInterface *iface );
+static void class_init( NAGConfClass *klass );
+static void iio_provider_iface_init( NAIIOProviderInterface *iface );
static void instance_init( GTypeInstance *instance, gpointer klass );
static void instance_get_property( GObject *object, guint property_id, GValue *value, GParamSpec *spec );
static void instance_set_property( GObject *object, guint property_id, const GValue *value, GParamSpec *spec );
static void instance_dispose( GObject *object );
static void instance_finalize( GObject *object );
-static GSList *do_load_actions( NactIIOProvider *provider );
-static void load_action_properties( NactGConf *gconf, NactAction *action );
-static GSList *load_profiles( NactGConf *gconf, NactAction *action );
-static void load_profile_properties( NactGConf *gconf, NactActionProfile *profile );
-static GSList *load_subdirs( const NactGConf *gconf, const gchar *path );
-static GSList *load_keys_values( const NactGConf *gconf, const gchar *path );
+static GSList *do_load_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 );
+static GSList *load_subdirs( const NAGConf *gconf, const gchar *path );
+static GSList *load_keys_values( const NAGConf *gconf, const gchar *path );
static void free_keys_values( GSList *keys );
static gchar *path_to_key( const gchar *path );
-static void set_item_properties( NactObject *object, GSList *properties );
-static NactPivotNotify *entry_to_notify( const GConfEntry *entry );
+static void set_item_properties( NAObject *object, GSList *properties );
+static NAPivotNotify *entry_to_notify( const GConfEntry *entry );
-static guint install_gconf_watch( NactGConf *gconf );
-static void remove_gconf_watch( NactGConf *gconf );
+static guint install_gconf_watch( NAGConf *gconf );
+static void remove_gconf_watch( NAGConf *gconf );
static void action_changed_cb( GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data );
GType
-nact_gconf_get_type( void )
+na_gconf_get_type( void )
{
static GType object_type = 0;
@@ -112,18 +112,18 @@ static GType
register_type( void )
{
static GTypeInfo info = {
- sizeof( NactGConfClass ),
+ sizeof( NAGConfClass ),
NULL,
NULL,
( GClassInitFunc ) class_init,
NULL,
NULL,
- sizeof( NactGConf ),
+ sizeof( NAGConf ),
0,
( GInstanceInitFunc ) instance_init
};
- GType type = g_type_register_static( G_TYPE_OBJECT, "NactGConf", &info, 0 );
+ GType type = g_type_register_static( G_TYPE_OBJECT, "NAGConf", &info, 0 );
static const GInterfaceInfo iio_provider_iface_info = {
( GInterfaceInitFunc ) iio_provider_iface_init,
@@ -131,15 +131,15 @@ register_type( void )
NULL
};
- g_type_add_interface_static( type, NACT_IIO_PROVIDER_TYPE, &iio_provider_iface_info );
+ g_type_add_interface_static( type, NA_IIO_PROVIDER_TYPE, &iio_provider_iface_info );
return( type );
}
static void
-class_init( NactGConfClass *klass )
+class_init( NAGConfClass *klass )
{
- static const gchar *thisfn = "nact_gconf_class_init";
+ static const gchar *thisfn = "na_gconf_class_init";
g_debug( "%s: klass=%p", thisfn, klass );
st_parent_class = g_type_class_peek_parent( klass );
@@ -158,13 +158,13 @@ class_init( NactGConfClass *klass )
G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE );
g_object_class_install_property( object_class, PROP_NOTIFIED, spec );
- klass->private = g_new0( NactGConfClassPrivate, 1 );
+ klass->private = g_new0( NAGConfClassPrivate, 1 );
}
static void
-iio_provider_iface_init( NactIIOProviderInterface *iface )
+iio_provider_iface_init( NAIIOProviderInterface *iface )
{
- static const gchar *thisfn = "nact_gconf_iio_provider_iface_init";
+ static const gchar *thisfn = "na_gconf_iio_provider_iface_init";
g_debug( "%s: iface=%p", thisfn, iface );
iface->load_actions = do_load_actions;
@@ -173,13 +173,13 @@ iio_provider_iface_init( NactIIOProviderInterface *iface )
static void
instance_init( GTypeInstance *instance, gpointer klass )
{
- static const gchar *thisfn = "nact_gconf_instance_init";
+ static const gchar *thisfn = "na_gconf_instance_init";
g_debug( "%s: instance=%p, klass=%p", thisfn, instance, klass );
- g_assert( NACT_IS_GCONF( instance ));
- NactGConf *self = NACT_GCONF( instance );
+ g_assert( NA_IS_GCONF( instance ));
+ NAGConf *self = NA_GCONF( instance );
- self->private = g_new0( NactGConfPrivate, 1 );
+ self->private = g_new0( NAGConfPrivate, 1 );
self->private->dispose_has_run = FALSE;
self->private->gconf = gconf_client_get_default();
@@ -189,8 +189,8 @@ instance_init( GTypeInstance *instance, gpointer klass )
static void
instance_get_property( GObject *object, guint property_id, GValue *value, GParamSpec *spec )
{
- g_assert( NACT_IS_GCONF( object ));
- NactGConf *self = NACT_GCONF( object );
+ g_assert( NA_IS_GCONF( object ));
+ NAGConf *self = NA_GCONF( object );
switch( property_id ){
case PROP_NOTIFIED:
@@ -206,8 +206,8 @@ instance_get_property( GObject *object, guint property_id, GValue *value, GParam
static void
instance_set_property( GObject *object, guint property_id, const GValue *value, GParamSpec *spec )
{
- g_assert( NACT_IS_GCONF( object ));
- NactGConf *self = NACT_GCONF( object );
+ g_assert( NA_IS_GCONF( object ));
+ NAGConf *self = NA_GCONF( object );
switch( property_id ){
case PROP_NOTIFIED:
@@ -223,8 +223,8 @@ instance_set_property( GObject *object, guint property_id, const GValue *value,
static void
instance_dispose( GObject *object )
{
- g_assert( NACT_IS_GCONF( object ));
- NactGConf *self = NACT_GCONF( object );
+ g_assert( NA_IS_GCONF( object ));
+ NAGConf *self = NA_GCONF( object );
if( !self->private->dispose_has_run ){
@@ -242,8 +242,8 @@ instance_dispose( GObject *object )
static void
instance_finalize( GObject *object )
{
- g_assert( NACT_IS_GCONF( object ));
- /*NactGConf *self = NACT_GCONF( object );*/
+ g_assert( NA_IS_GCONF( object ));
+ /*NAGConf *self = NA_GCONF( object );*/
/* chain call to parent class */
if( st_parent_class->finalize ){
@@ -259,55 +259,55 @@ instance_finalize( GObject *object )
*
* The object to be notified will receive a
* "notify_pivot_of_action_changed" message for each detected
- * modification, with a pointer to a newly allocated NactPivotNotify
+ * modification, with a pointer to a newly allocated NAPivotNotify
* structure describing the change.
*/
-NactGConf *
-nact_gconf_new( const GObject *handler )
+NAGConf *
+na_gconf_new( const GObject *handler )
{
- return( g_object_new( NACT_GCONF_TYPE, PROP_NOTIFIED_STR, handler, NULL ));
+ return( g_object_new( NA_GCONF_TYPE, PROP_NOTIFIED_STR, handler, NULL ));
}
/*
- * NactIIOProviderInterface implementation
+ * NAIIOProviderInterface implementation
* load the list of actions and returns them as a GSList
*/
static GSList *
-do_load_actions( NactIIOProvider *provider )
+do_load_actions( NAIIOProvider *provider )
{
static const gchar *thisfn = "nacf_gconf_do_load_actions";
g_debug( "%s: provider=%p", thisfn, provider );
- g_assert( NACT_IS_IIO_PROVIDER( provider ));
- g_assert( NACT_IS_GCONF( provider ));
- NactGConf *self = NACT_GCONF( provider );
+ g_assert( NA_IS_IIO_PROVIDER( provider ));
+ g_assert( NA_IS_GCONF( provider ));
+ NAGConf *self = NA_GCONF( provider );
GSList *items = NULL;
GSList *ip;
- GSList *listpath = load_subdirs( self, NACT_GCONF_CONFIG_PATH );
+ GSList *listpath = load_subdirs( self, NA_GCONF_CONFIG_PATH );
GSList *profiles;
for( ip = listpath ; ip ; ip = ip->next ){
gchar *key = path_to_key(( const gchar * ) ip->data );
- NactAction *action = nact_action_new( key );
+ NAAction *action = na_action_new( key );
load_action_properties( self, action );
profiles = load_profiles( self, action );
- nact_action_set_profiles( action, profiles );
- nact_action_free_profiles( profiles );
+ na_action_set_profiles( action, profiles );
+ na_action_free_profiles( profiles );
#ifdef NACT_MAINTAINER_MODE
- nact_object_dump( NACT_OBJECT( action ));
+ na_object_dump( NA_OBJECT( action ));
#endif
items = g_slist_prepend( items, action );
g_free( key );
}
- nactuti_free_string_list( listpath );
+ na_utils_free_string_list( listpath );
return( items );
}
@@ -316,20 +316,20 @@ do_load_actions( NactIIOProvider *provider )
* load and set the properties of the specified action
*/
static void
-load_action_properties( NactGConf *gconf, NactAction *action )
+load_action_properties( NAGConf *gconf, NAAction *action )
{
/*static const gchar *thisfn = "nacf_gconf_load_action_properties";
g_debug( "%s: gconf=%p, action=%p", thisfn, gconf, action );*/
- g_assert( NACT_IS_GCONF( gconf ));
- g_assert( NACT_IS_ACTION( action ));
+ g_assert( NA_IS_GCONF( gconf ));
+ g_assert( NA_IS_ACTION( action ));
- gchar *uuid = nact_action_get_uuid( action );
- gchar *path = g_strdup_printf( "%s/%s", NACT_GCONF_CONFIG_PATH, uuid );
+ gchar *uuid = na_action_get_uuid( action );
+ gchar *path = g_strdup_printf( "%s/%s", NA_GCONF_CONFIG_PATH, uuid );
GSList *properties = load_keys_values( gconf, path );
- set_item_properties( NACT_OBJECT( action ), properties );
+ set_item_properties( NA_OBJECT( action ), properties );
free_keys_values( properties );
g_free( uuid );
@@ -340,16 +340,16 @@ load_action_properties( NactGConf *gconf, NactAction *action )
* load the list of profiles for an action and returns them as a GSList
*/
static GSList *
-load_profiles( NactGConf *gconf, NactAction *action )
+load_profiles( NAGConf *gconf, NAAction *action )
{
/*static const gchar *thisfn = "nacf_gconf_load_profiles";
g_debug( "%s: gconf=%p, action=%p", thisfn, gconf, action );*/
- g_assert( NACT_IS_GCONF( gconf ));
- g_assert( NACT_IS_ACTION( action ));
+ g_assert( NA_IS_GCONF( gconf ));
+ g_assert( NA_IS_ACTION( action ));
- gchar *uuid = nact_action_get_uuid( action );
- gchar *path = g_strdup_printf( "%s/%s", NACT_GCONF_CONFIG_PATH, uuid );
+ gchar *uuid = na_action_get_uuid( action );
+ gchar *path = g_strdup_printf( "%s/%s", NA_GCONF_CONFIG_PATH, uuid );
GSList *ip;
GSList *items = NULL;
@@ -358,13 +358,13 @@ load_profiles( NactGConf *gconf, NactAction *action )
for( ip = listpath ; ip ; ip = ip->next ){
gchar *key = path_to_key(( const gchar * ) ip->data );
- NactActionProfile *profile = nact_action_profile_new( NACT_OBJECT( action ), key );
+ NAActionProfile *profile = na_action_profile_new( NA_OBJECT( action ), key );
load_profile_properties( gconf, profile );
items = g_slist_prepend( items, profile );
}
- nactuti_free_string_list( listpath );
+ na_utils_free_string_list( listpath );
g_free( path );
g_free( uuid );
@@ -375,25 +375,25 @@ load_profiles( NactGConf *gconf, NactAction *action )
* load and set the properties of the specified profile
*/
static void
-load_profile_properties( NactGConf *gconf, NactActionProfile *profile )
+load_profile_properties( NAGConf *gconf, NAActionProfile *profile )
{
/*static const gchar *thisfn = "nacf_gconf_load_profile_properties";
g_debug( "%s: gconf=%p, profile=%p", thisfn, gconf, profile );*/
- g_assert( NACT_IS_GCONF( gconf ));
- g_assert( NACT_IS_ACTION_PROFILE( profile ));
+ g_assert( NA_IS_GCONF( gconf ));
+ g_assert( NA_IS_ACTION_PROFILE( profile ));
- NactAction *action =
- NACT_ACTION( nact_action_profile_get_action( NACT_ACTION_PROFILE( profile )));
- g_assert( NACT_IS_ACTION( action ));
+ NAAction *action =
+ NA_ACTION( na_action_profile_get_action( NA_ACTION_PROFILE( profile )));
+ g_assert( NA_IS_ACTION( action ));
- gchar *uuid = nact_action_get_uuid( action );
+ gchar *uuid = na_action_get_uuid( action );
gchar *path = g_strdup_printf(
- "%s/%s/%s", NACT_GCONF_CONFIG_PATH, uuid, nact_action_profile_get_name( profile ));
+ "%s/%s/%s", NA_GCONF_CONFIG_PATH, uuid, na_action_profile_get_name( profile ));
GSList *properties = load_keys_values( gconf, path );
- set_item_properties( NACT_OBJECT( profile ), properties );
+ set_item_properties( NA_OBJECT( profile ), properties );
free_keys_values( properties );
g_free( path );
@@ -405,9 +405,9 @@ load_profile_properties( NactGConf *gconf, NactActionProfile *profile )
* returns a list of keys as full path
*/
GSList *
-load_subdirs( const NactGConf *gconf, const gchar *path )
+load_subdirs( const NAGConf *gconf, const gchar *path )
{
- static const gchar *thisfn = "nact_gconf_load_subdirs";
+ static const gchar *thisfn = "na_gconf_load_subdirs";
GError *error = NULL;
GSList *list = gconf_client_all_dirs( gconf->private->gconf, path, &error );
@@ -427,9 +427,9 @@ load_subdirs( const NactGConf *gconf, const gchar *path )
* To free the returned list, call free_key_values
*/
static GSList *
-load_keys_values( const NactGConf *gconf, const gchar *path )
+load_keys_values( const NAGConf *gconf, const gchar *path )
{
- static const gchar *thisfn = "nact_gconf_load_keys_values";
+ static const gchar *thisfn = "na_gconf_load_keys_values";
GError *error = NULL;
GSList *list_path = gconf_client_all_entries( gconf->private->gconf, path, &error );
@@ -472,22 +472,22 @@ path_to_key( const gchar *path )
* properties is a list of path to entry
*/
static void
-set_item_properties( NactObject *object, GSList *properties )
+set_item_properties( NAObject *object, GSList *properties )
{
- static const gchar *thisfn = "nact_gconf_set_item_properties";
- g_assert( NACT_IS_OBJECT( object ));
+ static const gchar *thisfn = "na_gconf_set_item_properties";
+ g_assert( NA_IS_OBJECT( object ));
GSList *item;
for( item = properties ; item != NULL ; item = item->next ){
GConfEntry *entry = ( GConfEntry * ) item->data;
- NactPivotNotify *npn = entry_to_notify( entry );
+ NAPivotNotify *npn = entry_to_notify( entry );
if( npn->type ){
switch( npn->type ){
- case NACT_PIVOT_STR:
- case NACT_PIVOT_BOOL:
- case NACT_PIVOT_STRLIST:
+ case NA_PIVOT_STR:
+ case NA_PIVOT_BOOL:
+ case NA_PIVOT_STRLIST:
g_object_set( G_OBJECT( object ), npn->parm, npn->data, NULL );
break;
@@ -499,12 +499,12 @@ set_item_properties( NactObject *object, GSList *properties )
}
}
- nact_pivot_free_notify( npn );
+ na_pivot_free_notify( npn );
}
}
/*
- * convert a GConfEntry to a structure suitable to notify NactPivot
+ * convert a GConfEntry to a structure suitable to notify NAPivot
*
* when created or modified, the entry can be of the forms :
* key/parm
@@ -519,10 +519,10 @@ set_item_properties( NactObject *object, GSList *properties )
* as the entry no more exists in GConf and thus cannot be tested
* -> we will set this as key/parm, letting pivot try to interpret it
*/
-static NactPivotNotify *
+static NAPivotNotify *
entry_to_notify( const GConfEntry *entry )
{
- /*static const gchar *thisfn = "nact_gconf_entry_to_notify";*/
+ /*static const gchar *thisfn = "na_gconf_entry_to_notify";*/
GSList *listvalues, *iv, *strings;
g_assert( entry );
@@ -530,9 +530,9 @@ entry_to_notify( const GConfEntry *entry )
const gchar *path = gconf_entry_get_key( entry );
g_assert( path );
- NactPivotNotify *npn = g_new0( NactPivotNotify, 1 );
+ NAPivotNotify *npn = g_new0( NAPivotNotify, 1 );
- const gchar *subpath = path + strlen( NACT_GCONF_CONFIG_PATH ) + 1;
+ const gchar *subpath = path + strlen( NA_GCONF_CONFIG_PATH ) + 1;
gchar **split = g_strsplit( subpath, "/", -1 );
/*g_debug( "%s: [0]=%s, [1]=%s", thisfn, split[0], split[1] );*/
npn->uuid = g_strdup( split[0] );
@@ -549,12 +549,12 @@ entry_to_notify( const GConfEntry *entry )
switch( value->type ){
case GCONF_VALUE_STRING:
- npn->type = NACT_PIVOT_STR;
+ npn->type = NA_PIVOT_STR;
npn->data = ( gpointer ) g_strdup( gconf_value_get_string( value ));
break;
case GCONF_VALUE_BOOL:
- npn->type = NACT_PIVOT_BOOL;
+ npn->type = NA_PIVOT_BOOL;
npn->data = ( gpointer ) gconf_value_get_bool( value );
break;
@@ -566,9 +566,9 @@ entry_to_notify( const GConfEntry *entry )
( gpointer ) gconf_value_get_string(( GConfValue * ) iv->data ));
}
- npn->type = NACT_PIVOT_STRLIST;
- npn->data = ( gpointer ) nactuti_duplicate_string_list( strings );
- /*nactuti_free_string_list( strings );*/
+ npn->type = NA_PIVOT_STRLIST;
+ npn->data = ( gpointer ) na_utils_duplicate_string_list( strings );
+ /*na_utils_free_string_list( strings );*/
break;
default:
@@ -580,19 +580,19 @@ entry_to_notify( const GConfEntry *entry )
}
/*
- * note that we need the NactPivot object in action_changed_cb handler
+ * note that we need the NAPivot object in action_changed_cb handler
* but it is initialized as a construction property, and this watch is
* installed from instance_init, i.e. before properties are set..
- * we so pass NactGConf pointer which is already valid at this time.
+ * we so pass NAGConf pointer which is already valid at this time.
*/
static guint
-install_gconf_watch( NactGConf *gconf )
+install_gconf_watch( NAGConf *gconf )
{
- static const gchar *thisfn = "nact_gconf_install_gconf_watch";
+ static const gchar *thisfn = "na_gconf_install_gconf_watch";
GError *error = NULL;
gconf_client_add_dir(
- gconf->private->gconf, NACT_GCONF_CONFIG_PATH, GCONF_CLIENT_PRELOAD_RECURSIVE, &error );
+ gconf->private->gconf, NA_GCONF_CONFIG_PATH, GCONF_CLIENT_PRELOAD_RECURSIVE, &error );
if( error ){
g_error( "%s: error=%s", thisfn, error->message );
g_error_free( error );
@@ -602,7 +602,7 @@ install_gconf_watch( NactGConf *gconf )
guint notify_id =
gconf_client_notify_add(
gconf->private->gconf,
- NACT_GCONF_CONFIG_PATH,
+ NA_GCONF_CONFIG_PATH,
( GConfClientNotifyFunc ) action_changed_cb,
gconf,
NULL,
@@ -618,16 +618,16 @@ install_gconf_watch( NactGConf *gconf )
}
static void
-remove_gconf_watch( NactGConf *gconf )
+remove_gconf_watch( NAGConf *gconf )
{
- static const gchar *thisfn = "nact_gconf_remove_gconf_watch";
+ static const gchar *thisfn = "na_gconf_remove_gconf_watch";
GError *error = NULL;
if( gconf->private->notify_id ){
gconf_client_notify_remove( gconf->private->gconf, gconf->private->notify_id );
}
- gconf_client_remove_dir( gconf->private->gconf, NACT_GCONF_CONFIG_PATH, &error );
+ gconf_client_remove_dir( gconf->private->gconf, NA_GCONF_CONFIG_PATH, &error );
if( error ){
g_error( "%s: error=%s", thisfn, error->message );
g_error_free( error );
@@ -660,9 +660,9 @@ action_changed_cb( GConfClient *client, guint cnxn_id, GConfEntry *entry, gpoint
/*static const gchar *thisfn = "action_changed_cb";
g_debug( "%s: client=%p, cnxnid=%u, entry=%p, user_data=%p", thisfn, client, cnxn_id, entry, user_data );*/
- g_assert( NACT_IS_GCONF( user_data ));
- NactGConf *gconf = NACT_GCONF( user_data );
+ g_assert( NA_IS_GCONF( user_data ));
+ NAGConf *gconf = NA_GCONF( user_data );
- NactPivotNotify *npn = entry_to_notify( entry );
+ NAPivotNotify *npn = entry_to_notify( entry );
g_signal_emit_by_name( gconf->private->notified, "notify_pivot_of_action_changed", npn );
}
diff --git a/src/common/nact-gconf.h b/src/common/na-gconf.h
similarity index 57%
rename from src/common/nact-gconf.h
rename to src/common/na-gconf.h
index 4062e2a..23049ba 100644
--- a/src/common/nact-gconf.h
+++ b/src/common/na-gconf.h
@@ -28,11 +28,11 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __NACT_GCONF_H__
-#define __NACT_GCONF_H__
+#ifndef __NA_GCONF_H__
+#define __NA_GCONF_H__
/*
- * NactGConf class definition.
+ * NAGConf class definition.
*
* Implements the NactIIOProvider (I/O storage subsystem) interface.
*/
@@ -41,33 +41,33 @@
G_BEGIN_DECLS
-#define NACT_GCONF_TYPE ( nact_gconf_get_type())
-#define NACT_GCONF( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_GCONF_TYPE, NactGConf ))
-#define NACT_GCONF_CLASS( klass ) ( G_TYPE_CHECK_CLASS_CAST( klass, NACT_GCONF_TYPE, NactGConfClass ))
-#define NACT_IS_GCONF( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_GCONF_TYPE ))
-#define NACT_IS_GCONF_CLASS( klass ) ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NACT_GCONF_TYPE ))
-#define NACT_GCONF_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NACT_GCONF_TYPE, NactGConfClass ))
+#define NA_GCONF_TYPE ( na_gconf_get_type())
+#define NA_GCONF( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NA_GCONF_TYPE, NAGConf ))
+#define NA_GCONF_CLASS( klass ) ( G_TYPE_CHECK_CLASS_CAST( klass, NA_GCONF_TYPE, NAGConfClass ))
+#define NA_IS_GCONF( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NA_GCONF_TYPE ))
+#define NA_IS_GCONF_CLASS( klass ) ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NA_GCONF_TYPE ))
+#define NA_GCONF_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NA_GCONF_TYPE, NAGConfClass ))
-typedef struct NactGConfPrivate NactGConfPrivate;
+typedef struct NAGConfPrivate NAGConfPrivate;
typedef struct {
- GObject parent;
- NactGConfPrivate *private;
+ GObject parent;
+ NAGConfPrivate *private;
}
- NactGConf;
+ NAGConf;
-typedef struct NactGConfClassPrivate NactGConfClassPrivate;
+typedef struct NAGConfClassPrivate NAGConfClassPrivate;
typedef struct {
- GObjectClass parent;
- NactGConfClassPrivate *private;
+ GObjectClass parent;
+ NAGConfClassPrivate *private;
}
- NactGConfClass;
+ NAGConfClass;
-GType nact_gconf_get_type( void );
+GType na_gconf_get_type( void );
-NactGConf *nact_gconf_new( const GObject *notified );
+NAGConf *na_gconf_new( const GObject *notified );
G_END_DECLS
-#endif /* __NACT_GCONF_H__ */
+#endif /* __NA_GCONF_H__ */
diff --git a/src/common/nact-iio-provider.c b/src/common/na-iio-provider.c
similarity index 60%
rename from src/common/nact-iio-provider.c
rename to src/common/na-iio-provider.c
index 14d5d69..d7892ff 100644
--- a/src/common/nact-iio-provider.c
+++ b/src/common/na-iio-provider.c
@@ -34,25 +34,25 @@
#include <glib.h>
-#include "nact-action.h"
-#include "nact-action-profile.h"
-#include "nact-iio-provider.h"
-#include "nact-pivot.h"
+#include "na-action.h"
+#include "na-action-profile.h"
+#include "na-iio-provider.h"
+#include "na-pivot.h"
/* private interface data
*/
-struct NactIIOProviderInterfacePrivate {
+struct NAIIOProviderInterfacePrivate {
};
static GType register_type( void );
-static void interface_base_init( NactIIOProviderInterface *klass );
-static void interface_base_finalize( NactIIOProviderInterface *klass );
+static void interface_base_init( NAIIOProviderInterface *klass );
+static void interface_base_finalize( NAIIOProviderInterface *klass );
/**
* Registers the GType of this interface.
*/
GType
-nact_iio_provider_get_type( void )
+na_iio_provider_get_type( void )
{
static GType object_type = 0;
@@ -66,11 +66,11 @@ nact_iio_provider_get_type( void )
static GType
register_type( void )
{
- static const gchar *thisfn = "nact_iio_provider_register_type";
+ static const gchar *thisfn = "na_iio_provider_register_type";
g_debug( "%s", thisfn );
static const GTypeInfo info = {
- sizeof( NactIIOProviderInterface ),
+ sizeof( NAIIOProviderInterface ),
( GBaseInitFunc ) interface_base_init,
( GBaseFinalizeFunc ) interface_base_finalize,
NULL,
@@ -81,7 +81,7 @@ register_type( void )
NULL
};
- GType type = g_type_register_static( G_TYPE_INTERFACE, "NactIIOProvider", &info, 0 );
+ GType type = g_type_register_static( G_TYPE_INTERFACE, "NAIIOProvider", &info, 0 );
g_type_interface_add_prerequisite( type, G_TYPE_OBJECT );
@@ -89,15 +89,15 @@ register_type( void )
}
static void
-interface_base_init( NactIIOProviderInterface *klass )
+interface_base_init( NAIIOProviderInterface *klass )
{
- static const gchar *thisfn = "nact_iio_provider_interface_base_init";
+ static const gchar *thisfn = "na_iio_provider_interface_base_init";
static gboolean initialized = FALSE;
if( !initialized ){
g_debug( "%s: klass=%p", thisfn, klass );
- klass->private = g_new0( NactIIOProviderInterfacePrivate, 1 );
+ klass->private = g_new0( NAIIOProviderInterfacePrivate, 1 );
klass->load_actions = NULL;
@@ -106,9 +106,9 @@ interface_base_init( NactIIOProviderInterface *klass )
}
static void
-interface_base_finalize( NactIIOProviderInterface *klass )
+interface_base_finalize( NAIIOProviderInterface *klass )
{
- static const gchar *thisfn = "nact_iio_provider_interface_base_finalize";
+ static const gchar *thisfn = "na_iio_provider_interface_base_finalize";
static gboolean finalized = FALSE ;
if( !finalized ){
@@ -126,30 +126,30 @@ interface_base_finalize( NactIIOProviderInterface *klass )
* @object: the pivot object which owns the list of registered
* interface providers.
*
- * Returns a GSList of newly allocated NactAction objects.
+ * Returns a GSList of newly allocated NAAction objects.
*/
GSList *
-nact_iio_provider_load_actions( const GObject *object )
+na_iio_provider_load_actions( const GObject *object )
{
- static const gchar *thisfn = "nact_iio_provider_load_actions";
+ static const gchar *thisfn = "na_iio_provider_load_actions";
g_debug( "%s", thisfn );
- g_assert( NACT_IS_PIVOT( object ));
- NactPivot *pivot = NACT_PIVOT( object );
+ g_assert( NA_IS_PIVOT( object ));
+ NAPivot *pivot = NA_PIVOT( object );
GSList *actions = NULL;
GSList *ip;
GSList *list;
- NactIIOProvider *instance;
+ NAIIOProvider *instance;
- GSList *providers = nact_pivot_get_providers( pivot, NACT_IIO_PROVIDER_TYPE );
+ GSList *providers = na_pivot_get_providers( pivot, NA_IIO_PROVIDER_TYPE );
for( ip = providers ; ip ; ip = ip->next ){
- instance = NACT_IIO_PROVIDER( ip->data );
+ instance = NA_IIO_PROVIDER( ip->data );
- if( NACT_IIO_PROVIDER_GET_INTERFACE( instance )->load_actions ){
- list = NACT_IIO_PROVIDER_GET_INTERFACE( instance )->load_actions( instance );
+ if( NA_IIO_PROVIDER_GET_INTERFACE( instance )->load_actions ){
+ list = NA_IIO_PROVIDER_GET_INTERFACE( instance )->load_actions( instance );
actions = g_slist_concat( actions, list );
}
}
@@ -171,28 +171,28 @@ nact_iio_provider_load_actions( const GObject *object )
* Returns TRUE if the write is successfull, FALSE else.
*/
gboolean
-nact_iio_provider_write_action( const GObject *obj_pivot, const GObject *obj_action, gchar **message )
+na_iio_provider_write_action( const GObject *obj_pivot, const GObject *obj_action, gchar **message )
{
- static const gchar *thisfn = "nact_iio_provider_write_action";
+ static const gchar *thisfn = "na_iio_provider_write_action";
g_debug( "%s", thisfn );
- g_assert( NACT_IS_PIVOT( obj_pivot ));
- NactPivot *pivot = NACT_PIVOT( obj_pivot );
+ g_assert( NA_IS_PIVOT( obj_pivot ));
+ NAPivot *pivot = NA_PIVOT( obj_pivot );
- g_assert( NACT_IS_ACTION( obj_action ));
+ g_assert( NA_IS_ACTION( obj_action ));
gboolean ret = TRUE;
GSList *ip;
- NactIIOProvider *instance;
+ NAIIOProvider *instance;
- GSList *providers = nact_pivot_get_providers( pivot, NACT_IIO_PROVIDER_TYPE );
+ GSList *providers = na_pivot_get_providers( pivot, NA_IIO_PROVIDER_TYPE );
for( ip = providers ; ip ; ip = ip->next ){
- instance = NACT_IIO_PROVIDER( ip->data );
+ instance = NA_IIO_PROVIDER( ip->data );
- /*if( NACT_IIO_PROVIDER_GET_INTERFACE( instance )->write_action ){
- list = NACT_IIO_PROVIDER_GET_INTERFACE( instance )->load_actions( instance );
+ /*if( NA_IIO_PROVIDER_GET_INTERFACE( instance )->write_action ){
+ list = NA_IIO_PROVIDER_GET_INTERFACE( instance )->load_actions( instance );
actions = g_slist_concat( actions, list );
}*/
}
diff --git a/src/common/nact-iio-provider.h b/src/common/na-iio-provider.h
similarity index 57%
rename from src/common/nact-iio-provider.h
rename to src/common/na-iio-provider.h
index 1d747e4..c7e72cc 100644
--- a/src/common/nact-iio-provider.h
+++ b/src/common/na-iio-provider.h
@@ -28,11 +28,11 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __NACT_IIO_PROVIDER_H__
-#define __NACT_IIO_PROVIDER_H__
+#ifndef __NA_IIO_PROVIDER_H__
+#define __NA_IIO_PROVIDER_H__
/*
- * NactIIOProvider interface definition.
+ * NAIIOProvider interface definition.
*
* This is the API all storage subsystems should implement in order to
* provide i/o resources to NautilusActions.
@@ -46,30 +46,30 @@
G_BEGIN_DECLS
-#define NACT_IIO_PROVIDER_TYPE ( nact_iio_provider_get_type())
-#define NACT_IIO_PROVIDER( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_IIO_PROVIDER_TYPE, NactIIOProvider ))
-#define NACT_IS_IIO_PROVIDER( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_IIO_PROVIDER_TYPE ))
-#define NACT_IIO_PROVIDER_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), NACT_IIO_PROVIDER_TYPE, NactIIOProviderInterface ))
+#define NA_IIO_PROVIDER_TYPE ( na_iio_provider_get_type())
+#define NA_IIO_PROVIDER( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NA_IIO_PROVIDER_TYPE, NAIIOProvider ))
+#define NA_IS_IIO_PROVIDER( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NA_IIO_PROVIDER_TYPE ))
+#define NA_IIO_PROVIDER_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), NA_IIO_PROVIDER_TYPE, NAIIOProviderInterface ))
-typedef struct NactIIOProvider NactIIOProvider;
+typedef struct NAIIOProvider NAIIOProvider;
-typedef struct NactIIOProviderInterfacePrivate NactIIOProviderInterfacePrivate;
+typedef struct NAIIOProviderInterfacePrivate NAIIOProviderInterfacePrivate;
typedef struct {
- GTypeInterface parent;
- NactIIOProviderInterfacePrivate *private;
+ GTypeInterface parent;
+ NAIIOProviderInterfacePrivate *private;
/* i/o api */
- GSList * ( *load_actions )( NactIIOProvider *instance );
- gboolean ( *write_action )( NactIIOProvider *instance, const GObject *action, gchar **message );
+ GSList * ( *load_actions )( NAIIOProvider *instance );
+ gboolean ( *write_action )( NAIIOProvider *instance, const GObject *action, gchar **message );
}
- NactIIOProviderInterface;
+ NAIIOProviderInterface;
-GType nact_iio_provider_get_type( void );
+GType na_iio_provider_get_type( void );
-GSList *nact_iio_provider_load_actions( const GObject *pivot );
-gboolean nact_iio_provider_write_action( const GObject *pivot, const GObject *action, gchar **message );
+GSList *na_iio_provider_load_actions( const GObject *pivot );
+gboolean na_iio_provider_write_action( const GObject *pivot, const GObject *action, gchar **message );
G_END_DECLS
-#endif /* __NACT_IIO_PROVIDER_H__ */
+#endif /* __NA_IIO_PROVIDER_H__ */
diff --git a/src/common/nact-object.c b/src/common/na-object.c
similarity index 64%
rename from src/common/nact-object.c
rename to src/common/na-object.c
index 400ddd0..b2f9fae 100644
--- a/src/common/nact-object.c
+++ b/src/common/na-object.c
@@ -32,34 +32,33 @@
#include <config.h>
#endif
-#include "nact-object.h"
-#include "nact-uti-lists.h"
+#include "na-object.h"
/* private class data
*/
-struct NactObjectClassPrivate {
+struct NAObjectClassPrivate {
};
/* private instance data
*/
-struct NactObjectPrivate {
+struct NAObjectPrivate {
gboolean dispose_has_run;
};
static GObjectClass *st_parent_class = NULL;
-static GType register_type( void );
-static void class_init( NactObjectClass *klass );
-static void instance_init( GTypeInstance *instance, gpointer klass );
-static void instance_dispose( GObject *object );
-static void instance_finalize( GObject *object );
+static GType register_type( void );
+static void class_init( NAObjectClass *klass );
+static void instance_init( GTypeInstance *instance, gpointer klass );
+static void instance_dispose( GObject *object );
+static void instance_finalize( GObject *object );
-static void do_dump( const NactObject *object );
-static gchar *do_get_id( const NactObject *object );
-static gchar *do_get_label( const NactObject *object );
+static void do_dump( const NAObject *object );
+static gchar *do_get_id( const NAObject *object );
+static gchar *do_get_label( const NAObject *object );
GType
-nact_object_get_type( void )
+na_object_get_type( void )
{
static GType object_type = 0;
@@ -74,24 +73,24 @@ static GType
register_type( void )
{
static GTypeInfo info = {
- sizeof( NactObjectClass ),
+ sizeof( NAObjectClass ),
( GBaseInitFunc ) NULL,
( GBaseFinalizeFunc ) NULL,
( GClassInitFunc ) class_init,
NULL,
NULL,
- sizeof( NactObject ),
+ sizeof( NAObject ),
0,
( GInstanceInitFunc ) instance_init
};
- return( g_type_register_static( G_TYPE_OBJECT, "NactObject", &info, 0 ));
+ return( g_type_register_static( G_TYPE_OBJECT, "NAObject", &info, 0 ));
}
static void
-class_init( NactObjectClass *klass )
+class_init( NAObjectClass *klass )
{
- static const gchar *thisfn = "nact_object_class_init";
+ static const gchar *thisfn = "na_object_class_init";
g_debug( "%s: klass=%p", thisfn, klass );
st_parent_class = g_type_class_peek_parent( klass );
@@ -100,7 +99,7 @@ class_init( NactObjectClass *klass )
object_class->dispose = instance_dispose;
object_class->finalize = instance_finalize;
- klass->private = g_new0( NactObjectClassPrivate, 1 );
+ klass->private = g_new0( NAObjectClassPrivate, 1 );
klass->dump = do_dump;
klass->get_id = do_get_id;
@@ -110,13 +109,13 @@ class_init( NactObjectClass *klass )
static void
instance_init( GTypeInstance *instance, gpointer klass )
{
- /*static const gchar *thisfn = "nact_object_instance_init";
+ /*static const gchar *thisfn = "na_object_instance_init";
g_debug( "%s: instance=%p, klass=%p", thisfn, instance, klass );*/
- g_assert( NACT_IS_OBJECT( instance ));
- NactObject *self = NACT_OBJECT( instance );
+ g_assert( NA_IS_OBJECT( instance ));
+ NAObject *self = NA_OBJECT( instance );
- self->private = g_new0( NactObjectPrivate, 1 );
+ self->private = g_new0( NAObjectPrivate, 1 );
self->private->dispose_has_run = FALSE;
}
@@ -124,8 +123,8 @@ instance_init( GTypeInstance *instance, gpointer klass )
static void
instance_dispose( GObject *object )
{
- g_assert( NACT_IS_OBJECT( object ));
- NactObject *self = NACT_OBJECT( object );
+ g_assert( NA_IS_OBJECT( object ));
+ NAObject *self = NA_OBJECT( object );
if( !self->private->dispose_has_run ){
@@ -139,8 +138,8 @@ instance_dispose( GObject *object )
static void
instance_finalize( GObject *object )
{
- g_assert( NACT_IS_OBJECT( object ));
- /*NactObject *self = ( NactObject * ) object;*/
+ g_assert( NA_IS_OBJECT( object ));
+ /*NAObject *self = ( NAObject * ) object;*/
/* chain call to parent class */
if( st_parent_class->finalize ){
@@ -149,10 +148,10 @@ instance_finalize( GObject *object )
}
static void
-do_dump( const NactObject *object )
+do_dump( const NAObject *object )
{
- static const char *thisfn = "nact_object_do_dump";
- g_assert( NACT_IS_OBJECT( object ));
+ static const char *thisfn = "na_object_do_dump";
+ g_assert( NA_IS_OBJECT( object ));
g_debug( "%s: object=%p", thisfn, object );
}
@@ -166,17 +165,17 @@ do_dump( const NactObject *object )
* @object: object to be dumped.
*/
void
-nact_object_dump( const NactObject *object )
+na_object_dump( const NAObject *object )
{
- g_assert( NACT_IS_OBJECT( object ));
+ g_assert( NA_IS_OBJECT( object ));
- NACT_OBJECT_GET_CLASS( object )->dump( object );
+ NA_OBJECT_GET_CLASS( object )->dump( object );
}
static gchar *
-do_get_id( const NactObject *object )
+do_get_id( const NAObject *object )
{
- g_assert( NACT_IS_OBJECT( object ));
+ g_assert( NA_IS_OBJECT( object ));
return(( gchar * ) NULL );
}
@@ -186,21 +185,21 @@ do_get_id( const NactObject *object )
* This is a virtual function which should be implemented by the
* derived class ; if not, this parent object returns NULL.
*
- * @object: targeted NactObject object.
+ * @object: targeted NAObject object.
*
* The returned string should be g_freed by the caller.
*/
gchar *
-nact_object_get_id( const NactObject *object )
+na_object_get_id( const NAObject *object )
{
- g_assert( NACT_IS_OBJECT( object ));
- return( NACT_OBJECT_GET_CLASS( object )->get_id( object ));
+ g_assert( NA_IS_OBJECT( object ));
+ return( NA_OBJECT_GET_CLASS( object )->get_id( object ));
}
static gchar *
-do_get_label( const NactObject *object )
+do_get_label( const NAObject *object )
{
- g_assert( NACT_IS_OBJECT( object ));
+ g_assert( NA_IS_OBJECT( object ));
return(( gchar * ) NULL );
}
@@ -210,13 +209,13 @@ do_get_label( const NactObject *object )
* This is a virtual function which should be implemented by the
* derived class ; if not, this parent object returns NULL.
*
- * @object: targeted NactObject object.
+ * @object: targeted NAObject object.
*
* The returned string should be g_freed by the caller.
*/
gchar *
-nact_object_get_label( const NactObject *object )
+na_object_get_label( const NAObject *object )
{
- g_assert( NACT_IS_OBJECT( object ));
- return( NACT_OBJECT_GET_CLASS( object )->get_label( object ));
+ g_assert( NA_IS_OBJECT( object ));
+ return( NA_OBJECT_GET_CLASS( object )->get_label( object ));
}
diff --git a/src/common/nact-object.h b/src/common/na-object.h
similarity index 54%
rename from src/common/nact-object.h
rename to src/common/na-object.h
index fc66e55..9d11de9 100644
--- a/src/common/nact-object.h
+++ b/src/common/na-object.h
@@ -28,11 +28,11 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __NACT_OBJECT_H__
-#define __NACT_OBJECT_H__
+#ifndef __NA_OBJECT_H__
+#define __NA_OBJECT_H__
/*
- * NactObject class definition.
+ * NAObject class definition.
*
* This is the base class for NactAction and NactActionProfile.
*
@@ -45,40 +45,40 @@
G_BEGIN_DECLS
-#define NACT_OBJECT_TYPE ( nact_object_get_type())
-#define NACT_OBJECT( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_OBJECT_TYPE, NactObject ))
-#define NACT_OBJECT_CLASS( klass ) ( G_TYPE_CHECK_CLASS_CAST( klass, NACT_OBJECT_TYPE, NactObjectClass ))
-#define NACT_IS_OBJECT( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_OBJECT_TYPE ))
-#define NACT_IS_OBJECT_CLASS( klass ) ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NACT_OBJECT_TYPE ))
-#define NACT_OBJECT_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NACT_OBJECT_TYPE, NactObjectClass ))
+#define NA_OBJECT_TYPE ( na_object_get_type())
+#define NA_OBJECT( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NA_OBJECT_TYPE, NAObject ))
+#define NA_OBJECT_CLASS( klass ) ( G_TYPE_CHECK_CLASS_CAST( klass, NA_OBJECT_TYPE, NAObjectClass ))
+#define NA_IS_OBJECT( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NA_OBJECT_TYPE ))
+#define NA_IS_OBJECT_CLASS( klass ) ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NA_OBJECT_TYPE ))
+#define NA_OBJECT_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NA_OBJECT_TYPE, NAObjectClass ))
-typedef struct NactObjectPrivate NactObjectPrivate;
+typedef struct NAObjectPrivate NAObjectPrivate;
typedef struct {
- GObject parent;
- NactObjectPrivate *private;
+ GObject parent;
+ NAObjectPrivate *private;
}
- NactObject;
+ NAObject;
-typedef struct NactObjectClassPrivate NactObjectClassPrivate;
+typedef struct NAObjectClassPrivate NAObjectClassPrivate;
typedef struct {
- GObjectClass parent;
- NactObjectClassPrivate *private;
+ GObjectClass parent;
+ NAObjectClassPrivate *private;
/* virtual public functions */
- void ( *dump )( const NactObject *object );
- gchar * ( *get_id )( const NactObject *object );
- gchar * ( *get_label )( const NactObject *object );
+ void ( *dump ) ( const NAObject *object );
+ gchar * ( *get_id ) ( const NAObject *object );
+ gchar * ( *get_label )( const NAObject *object );
}
- NactObjectClass;
+ NAObjectClass;
-GType nact_object_get_type( void );
+GType na_object_get_type( void );
-void nact_object_dump( const NactObject *object );
-gchar *nact_object_get_id( const NactObject *object );
-gchar *nact_object_get_label( const NactObject *object );
+void na_object_dump( const NAObject *object );
+gchar *na_object_get_id( const NAObject *object );
+gchar *na_object_get_label( const NAObject *object );
G_END_DECLS
-#endif /* __NACT_OBJECT_H__ */
+#endif /* __NA_OBJECT_H__ */
diff --git a/src/common/nact-pivot.c b/src/common/na-pivot.c
similarity index 67%
rename from src/common/nact-pivot.c
rename to src/common/na-pivot.c
index 83a2c67..054b9ea 100644
--- a/src/common/nact-pivot.c
+++ b/src/common/na-pivot.c
@@ -35,20 +35,20 @@
#include <string.h>
#include <uuid/uuid.h>
-#include "nact-action.h"
-#include "nact-gconf.h"
-#include "nact-pivot.h"
-#include "nact-iio-provider.h"
-#include "nact-uti-lists.h"
+#include "na-action.h"
+#include "na-gconf.h"
+#include "na-pivot.h"
+#include "na-iio-provider.h"
+#include "na-utils.h"
/* private class data
*/
-struct NactPivotClassPrivate {
+struct NAPivotClassPrivate {
};
/* private instance data
*/
-struct NactPivotPrivate {
+struct NAPivotPrivate {
gboolean dispose_has_run;
/* instance to be notified of an action modification
@@ -57,7 +57,7 @@ struct NactPivotPrivate {
/* list of interface providers
* needs to be in the instance rather than in the class to be able
- * to pass NactPivot object to the IO provider, so that the later
+ * to pass NAPivot object to the IO provider, so that the later
* is able to have access to the former (and its list of actions)
*/
GSList *providers;
@@ -90,23 +90,23 @@ static GTimeVal st_last_event;
static guint st_event_source_id = 0;
static gint st_timeout_usec = 500000;
-static GType register_type( void );
-static void class_init( NactPivotClass *klass );
-static void instance_init( GTypeInstance *instance, gpointer klass );
-static GSList *register_interface_providers( const NactPivot *pivot );
-static void instance_get_property( GObject *object, guint property_id, GValue *value, GParamSpec *spec );
-static void instance_set_property( GObject *object, guint property_id, const GValue *value, GParamSpec *spec );
-static void instance_dispose( GObject *object );
-static void instance_finalize( GObject *object );
-
-static void free_actions( GSList *list );
-static gint sort_actions_by_label( gconstpointer a1, gconstpointer a2 );
-static void action_changed_handler( NactPivot *pivot, gpointer user_data );
-static gboolean on_action_changed_timeout( gpointer user_data );
-static gulong time_val_diff( const GTimeVal *recent, const GTimeVal *old );
+static GType register_type( void );
+static void class_init( NAPivotClass *klass );
+static void instance_init( GTypeInstance *instance, gpointer klass );
+static GSList *register_interface_providers( const NAPivot *pivot );
+static void instance_get_property( GObject *object, guint property_id, GValue *value, GParamSpec *spec );
+static void instance_set_property( GObject *object, guint property_id, const GValue *value, GParamSpec *spec );
+static void instance_dispose( GObject *object );
+static void instance_finalize( GObject *object );
+
+static void free_actions( GSList *list );
+static gint sort_actions_by_label( gconstpointer a1, gconstpointer a2 );
+static void action_changed_handler( NAPivot *pivot, gpointer user_data );
+static gboolean on_action_changed_timeout( gpointer user_data );
+static gulong time_val_diff( const GTimeVal *recent, const GTimeVal *old );
GType
-nact_pivot_get_type( void )
+na_pivot_get_type( void )
{
static GType object_type = 0;
@@ -121,24 +121,24 @@ static GType
register_type( void )
{
static GTypeInfo info = {
- sizeof( NactPivotClass ),
+ sizeof( NAPivotClass ),
( GBaseInitFunc ) NULL,
( GBaseFinalizeFunc ) NULL,
( GClassInitFunc ) class_init,
NULL,
NULL,
- sizeof( NactPivot ),
+ sizeof( NAPivot ),
0,
( GInstanceInitFunc ) instance_init
};
- return( g_type_register_static( G_TYPE_OBJECT, "NactPivot", &info, 0 ));
+ return( g_type_register_static( G_TYPE_OBJECT, "NAPivot", &info, 0 ));
}
static void
-class_init( NactPivotClass *klass )
+class_init( NAPivotClass *klass )
{
- static const gchar *thisfn = "nact_pivot_class_init";
+ static const gchar *thisfn = "na_pivot_class_init";
g_debug( "%s: klass=%p", thisfn, klass );
st_parent_class = g_type_class_peek_parent( klass );
@@ -157,7 +157,7 @@ class_init( NactPivotClass *klass )
G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE );
g_object_class_install_property( object_class, PROP_NOTIFIED, spec );
- klass->private = g_new0( NactPivotClassPrivate, 1 );
+ klass->private = g_new0( NAPivotClassPrivate, 1 );
/* see nautilus_actions_class_init for why we use this function
*/
@@ -178,27 +178,27 @@ class_init( NactPivotClass *klass )
static void
instance_init( GTypeInstance *instance, gpointer klass )
{
- static const gchar *thisfn = "nact_pivot_instance_init";
+ static const gchar *thisfn = "na_pivot_instance_init";
g_debug( "%s: instance=%p, klass=%p", thisfn, instance, klass );
- g_assert( NACT_IS_PIVOT( instance ));
- NactPivot* self = NACT_PIVOT( instance );
+ g_assert( NA_IS_PIVOT( instance ));
+ NAPivot* self = NA_PIVOT( instance );
- self->private = g_new0( NactPivotPrivate, 1 );
+ self->private = g_new0( NAPivotPrivate, 1 );
self->private->dispose_has_run = FALSE;
self->private->providers = register_interface_providers( self );
- self->private->actions = nact_iio_provider_load_actions( G_OBJECT( self ));
+ self->private->actions = na_iio_provider_load_actions( G_OBJECT( self ));
}
static GSList *
-register_interface_providers( const NactPivot *pivot )
+register_interface_providers( const NAPivot *pivot )
{
- static const gchar *thisfn = "nact_pivot_register_interface_providers";
+ static const gchar *thisfn = "na_pivot_register_interface_providers";
g_debug( "%s", thisfn );
GSList *list = NULL;
- list = g_slist_prepend( list, nact_gconf_new( G_OBJECT( pivot )));
+ list = g_slist_prepend( list, na_gconf_new( G_OBJECT( pivot )));
return( list );
}
@@ -206,8 +206,8 @@ register_interface_providers( const NactPivot *pivot )
static void
instance_get_property( GObject *object, guint property_id, GValue *value, GParamSpec *spec )
{
- g_assert( NACT_IS_PIVOT( object ));
- NactPivot *self = NACT_PIVOT( object );
+ g_assert( NA_IS_PIVOT( object ));
+ NAPivot *self = NA_PIVOT( object );
switch( property_id ){
case PROP_NOTIFIED:
@@ -223,8 +223,8 @@ instance_get_property( GObject *object, guint property_id, GValue *value, GParam
static void
instance_set_property( GObject *object, guint property_id, const GValue *value, GParamSpec *spec )
{
- g_assert( NACT_IS_PIVOT( object ));
- NactPivot *self = NACT_PIVOT( object );
+ g_assert( NA_IS_PIVOT( object ));
+ NAPivot *self = NA_PIVOT( object );
switch( property_id ){
case PROP_NOTIFIED:
@@ -240,11 +240,11 @@ instance_set_property( GObject *object, guint property_id, const GValue *value,
static void
instance_dispose( GObject *object )
{
- static const gchar *thisfn = "nact_pivot_instance_dispose";
+ static const gchar *thisfn = "na_pivot_instance_dispose";
g_debug( "%s: object=%p", thisfn, object );
- g_assert( NACT_IS_PIVOT( object ));
- NactPivot *self = NACT_PIVOT( object );
+ g_assert( NA_IS_PIVOT( object ));
+ NAPivot *self = NA_PIVOT( object );
if( !self->private->dispose_has_run ){
@@ -262,11 +262,11 @@ instance_dispose( GObject *object )
static void
instance_finalize( GObject *object )
{
- static const gchar *thisfn = "nact_pivot_instance_finalize";
+ static const gchar *thisfn = "na_pivot_instance_finalize";
g_debug( "%s: object=%p", thisfn, object );
- g_assert( NACT_IS_PIVOT( object ));
- NactPivot *self = ( NactPivot * ) object;
+ g_assert( NA_IS_PIVOT( object ));
+ NAPivot *self = ( NAPivot * ) object;
/* release the interface providers */
GSList *ip;
@@ -283,7 +283,7 @@ instance_finalize( GObject *object )
}
/**
- * Allocates a new NactPivot object.
+ * Allocates a new NAPivot object.
*
* @target: the GObject which will handled Nautilus notification, and
* should be notified when an actions is added, modified or removed in
@@ -292,10 +292,10 @@ instance_finalize( GObject *object )
* The target object will receive a "notify_nautilus_of_action_changed"
* message, without any parameter.
*/
-NactPivot *
-nact_pivot_new( const GObject *target )
+NAPivot *
+na_pivot_new( const GObject *target )
{
- return( g_object_new( NACT_PIVOT_TYPE, PROP_NOTIFIED_STR, target, NULL ));
+ return( g_object_new( NA_PIVOT_TYPE, PROP_NOTIFIED_STR, target, NULL ));
}
/**
@@ -309,12 +309,12 @@ nact_pivot_new( const GObject *target )
* @type: the type of searched interface.
*/
GSList *
-nact_pivot_get_providers( const NactPivot *pivot, GType type )
+na_pivot_get_providers( const NAPivot *pivot, GType type )
{
- static const gchar *thisfn = "nact_pivot_get_providers";
+ static const gchar *thisfn = "na_pivot_get_providers";
g_debug( "%s", thisfn );
- g_assert( NACT_IS_PIVOT( pivot ));
+ g_assert( NA_IS_PIVOT( pivot ));
GSList *list = NULL;
GSList *ip;
@@ -330,15 +330,15 @@ nact_pivot_get_providers( const NactPivot *pivot, GType type )
/**
* Return the list of actions, sorted by label.
*
- * @pivot: this NactPivot object.
+ * @pivot: this NAPivot object.
*
- * The returned list is owned by this NactPivot object, and should not
+ * The returned list is owned by this NAPivot object, and should not
* be freed, nor unref by the caller.
*/
GSList *
-nact_pivot_get_label_sorted_actions( const NactPivot *pivot )
+na_pivot_get_label_sorted_actions( const NAPivot *pivot )
{
- g_assert( NACT_IS_PIVOT( pivot ));
+ g_assert( NA_IS_PIVOT( pivot ));
GSList *sorted = g_slist_sort( pivot->private->actions, ( GCompareFunc ) sort_actions_by_label );
return( sorted );
}
@@ -346,15 +346,15 @@ nact_pivot_get_label_sorted_actions( const NactPivot *pivot )
/**
* Return the list of actions.
*
- * @pivot: this NactPivot object.
+ * @pivot: this NAPivot object.
*
- * The returned list is owned by this NactPivot object, and should not
+ * The returned list is owned by this NAPivot object, and should not
* be freed, nor unref by the caller.
*/
GSList *
-nact_pivot_get_actions( const NactPivot *pivot )
+na_pivot_get_actions( const NAPivot *pivot )
{
- g_assert( NACT_IS_PIVOT( pivot ));
+ g_assert( NA_IS_PIVOT( pivot ));
return( pivot->private->actions );
}
@@ -363,7 +363,7 @@ free_actions( GSList *list )
{
GSList *ia;
for( ia = list ; ia ; ia = ia->next ){
- g_object_unref( NACT_ACTION( ia->data ));
+ g_object_unref( NA_ACTION( ia->data ));
}
g_slist_free( list );
}
@@ -371,11 +371,11 @@ free_actions( GSList *list )
static gint
sort_actions_by_label( gconstpointer a1, gconstpointer a2 )
{
- NactAction *action1 = NACT_ACTION( a1 );
- gchar *label1 = nact_action_get_label( action1 );
+ NAAction *action1 = NA_ACTION( a1 );
+ gchar *label1 = na_action_get_label( action1 );
- NactAction *action2 = NACT_ACTION( a2 );
- gchar *label2 = nact_action_get_label( action2 );
+ NAAction *action2 = NA_ACTION( a2 );
+ gchar *label2 = na_action_get_label( action2 );
gint ret = g_utf8_collate( label1, label2 );
@@ -388,30 +388,30 @@ sort_actions_by_label( gconstpointer a1, gconstpointer a2 )
/**
* Return the specified action.
*
- * @pivot: this NactPivot object.
+ * @pivot: this NAPivot object.
*
* @uuid: required globally unique identifier (uuid).
*
- * Returns the specified NactAction object, or NULL if not found.
+ * Returns the specified NAAction object, or NULL if not found.
*
- * The returned pointer is owned by NactPivot, and should not be freed
+ * The returned pointer is owned by NAPivot, and should not be freed
* nor unref by the caller.
*/
GObject *
-nact_pivot_get_action( NactPivot *pivot, const gchar *uuid )
+na_pivot_get_action( NAPivot *pivot, const gchar *uuid )
{
GSList *ia;
- NactAction *act;
+ NAAction *act;
GObject *found = NULL;
uuid_t uua, uub;
gchar *uuid_act;
- g_assert( NACT_IS_PIVOT( pivot ));
+ g_assert( NA_IS_PIVOT( pivot ));
uuid_parse( uuid, uua );
for( ia = pivot->private->actions ; ia ; ia = ia->next ){
- act = NACT_ACTION( ia->data );
- uuid_act = nact_action_get_uuid( act );
+ act = NA_ACTION( ia->data );
+ uuid_act = na_action_get_uuid( act );
uuid_parse( uuid_act, uub );
g_free( uuid_act );
if( !uuid_compare( uua, uub )){
@@ -426,7 +426,7 @@ nact_pivot_get_action( NactPivot *pivot, const gchar *uuid )
/**
* Write an action.
*
- * @pivot: this NactPivot object.
+ * @pivot: this NAPivot object.
*
* @action: action to be written by the storage subsystem.
*
@@ -436,12 +436,12 @@ nact_pivot_get_action( NactPivot *pivot, const gchar *uuid )
* Returns TRUE if the write is successfull, FALSE else.
*/
gboolean
-nact_pivot_add_action( NactPivot *pivot, const GObject *action, gchar **message )
+na_pivot_write_action( NAPivot *pivot, const GObject *action, gchar **message )
{
- g_assert( NACT_IS_PIVOT( pivot ));
- g_assert( NACT_IS_ACTION( action ));
+ g_assert( NA_IS_PIVOT( pivot ));
+ g_assert( NA_IS_ACTION( action ));
g_assert( message );
- return( nact_iio_provider_write_action( G_OBJECT( pivot ), action, message ));
+ return( na_iio_provider_write_action( G_OBJECT( pivot ), action, message ));
}
/*
@@ -453,12 +453,12 @@ nact_pivot_add_action( NactPivot *pivot, const GObject *action, gchar **message
* the whole list of actions
*/
static void
-action_changed_handler( NactPivot *self, gpointer user_data )
+action_changed_handler( NAPivot *self, gpointer user_data )
{
- /*static const gchar *thisfn = "nact_pivot_action_changed_handler";
+ /*static const gchar *thisfn = "na_pivot_action_changed_handler";
g_debug( "%s: self=%p, data=%p", thisfn, self, user_data );*/
- g_assert( NACT_IS_PIVOT( self ));
+ g_assert( NA_IS_PIVOT( self ));
g_assert( user_data );
if( self->private->dispose_has_run ){
return;
@@ -482,13 +482,13 @@ action_changed_handler( NactPivot *self, gpointer user_data )
static gboolean
on_action_changed_timeout( gpointer user_data )
{
- /*static const gchar *thisfn = "nact_pivot_on_action_changed_timeout";
+ /*static const gchar *thisfn = "na_pivot_on_action_changed_timeout";
g_debug( "%s: pivot=%p", thisfn, user_data );*/
GTimeVal now;
- g_assert( NACT_IS_PIVOT( user_data ));
- NactPivot *pivot = NACT_PIVOT( user_data );
+ g_assert( NA_IS_PIVOT( user_data ));
+ NAPivot *pivot = NA_PIVOT( user_data );
g_get_current_time( &now );
gulong diff = time_val_diff( &now, &st_last_event );
@@ -497,7 +497,7 @@ on_action_changed_timeout( gpointer user_data )
}
free_actions( pivot->private->actions );
- pivot->private->actions = nact_iio_provider_load_actions( G_OBJECT( pivot ));
+ pivot->private->actions = na_iio_provider_load_actions( G_OBJECT( pivot ));
g_signal_emit_by_name( G_OBJECT( pivot->private->notified ), "notify_nautilus_of_action_changed" );
st_event_source_id = 0;
@@ -517,28 +517,28 @@ time_val_diff( const GTimeVal *recent, const GTimeVal *old )
}
/**
- * Free a NactPivotValue structure and its content.
+ * Free a NAPivotValue structure and its content.
*/
void
-nact_pivot_free_notify( NactPivotNotify *npn )
+na_pivot_free_notify( NAPivotNotify *npn )
{
if( npn ){
if( npn->type ){
switch( npn->type ){
- case NACT_PIVOT_STR:
+ case NA_PIVOT_STR:
g_free(( gchar * ) npn->data );
break;
- case NACT_PIVOT_BOOL:
+ case NA_PIVOT_BOOL:
break;
- case NACT_PIVOT_STRLIST:
- nactuti_free_string_list(( GSList * ) npn->data );
+ case NA_PIVOT_STRLIST:
+ na_utils_free_string_list(( GSList * ) npn->data );
break;
default:
- g_debug( "nact_pivot_free_notify: uuid=%s, profile=%s, parm=%s, type=%d",
+ g_debug( "na_pivot_free_notify: uuid=%s, profile=%s, parm=%s, type=%d",
npn->uuid, npn->profile, npn->parm, npn->type );
g_assert_not_reached();
break;
diff --git a/src/common/nact-pivot.h b/src/common/na-pivot.h
similarity index 51%
rename from src/common/nact-pivot.h
rename to src/common/na-pivot.h
index 26ed1dd..ac44f06 100644
--- a/src/common/nact-pivot.h
+++ b/src/common/na-pivot.h
@@ -28,13 +28,13 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __NACT_PIVOT_H__
-#define __NACT_PIVOT_H__
+#ifndef __NA_PIVOT_H__
+#define __NA_PIVOT_H__
/*
- * NactPivot class definition.
+ * NAPivot class definition.
*
- * A consuming program should allocate one new NactPivot object in its
+ * A consuming program should allocate one new NAPivot object in its
* startup phase. The class takes care of declaring the I/O interface,
* while registering the known providers. The object will then load
* itself the existing list of actions.
@@ -44,48 +44,48 @@
G_BEGIN_DECLS
-#define NACT_PIVOT_TYPE ( nact_pivot_get_type())
-#define NACT_PIVOT( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NACT_PIVOT_TYPE, NactPivot ))
-#define NACT_PIVOT_CLASS( klass ) ( G_TYPE_CHECK_CLASS_CAST( klass, NACT_PIVOT_TYPE, NactPivotClass ))
-#define NACT_IS_PIVOT( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NACT_PIVOT_TYPE ))
-#define NACT_IS_PIVOT_CLASS( klass ) ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NACT_PIVOT_TYPE ))
-#define NACT_PIVOT_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NACT_PIVOT_TYPE, NactPivotClass ))
+#define NA_PIVOT_TYPE ( na_pivot_get_type())
+#define NA_PIVOT( object ) ( G_TYPE_CHECK_INSTANCE_CAST( object, NA_PIVOT_TYPE, NAPivot ))
+#define NA_PIVOT_CLASS( klass ) ( G_TYPE_CHECK_CLASS_CAST( klass, NA_PIVOT_TYPE, NAPivotClass ))
+#define NA_IS_PIVOT( object ) ( G_TYPE_CHECK_INSTANCE_TYPE( object, NA_PIVOT_TYPE ))
+#define NA_IS_PIVOT_CLASS( klass ) ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NA_PIVOT_TYPE ))
+#define NA_PIVOT_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NA_PIVOT_TYPE, NAPivotClass ))
-typedef struct NactPivotPrivate NactPivotPrivate;
+typedef struct NAPivotPrivate NAPivotPrivate;
typedef struct {
- GObject parent;
- NactPivotPrivate *private;
+ GObject parent;
+ NAPivotPrivate *private;
}
- NactPivot;
+ NAPivot;
-typedef struct NactPivotClassPrivate NactPivotClassPrivate;
+typedef struct NAPivotClassPrivate NAPivotClassPrivate;
typedef struct {
- GObjectClass parent;
- NactPivotClassPrivate *private;
+ GObjectClass parent;
+ NAPivotClassPrivate *private;
}
- NactPivotClass;
+ NAPivotClass;
-GType nact_pivot_get_type( void );
+GType na_pivot_get_type( void );
-NactPivot *nact_pivot_new( const GObject *notified );
+NAPivot *na_pivot_new( const GObject *notified );
-GSList *nact_pivot_get_providers( const NactPivot *pivot, GType type );
+GSList *na_pivot_get_providers( const NAPivot *pivot, GType type );
-GSList *nact_pivot_get_label_sorted_actions( const NactPivot *pivot );
-GSList *nact_pivot_get_actions( const NactPivot *pivot );
+GSList *na_pivot_get_label_sorted_actions( const NAPivot *pivot );
+GSList *na_pivot_get_actions( const NAPivot *pivot );
-GObject *nact_pivot_get_action( NactPivot *pivot, const gchar *uuid );
+GObject *na_pivot_get_action( NAPivot *pivot, const gchar *uuid );
-gboolean nact_pivot_add_action( NactPivot *pivot, const GObject *action, gchar **message );
+gboolean na_pivot_write_action( NAPivot *pivot, const GObject *action, gchar **message );
/* data passed from the storage subsystem when an action is changed
*/
enum {
- NACT_PIVOT_STR = 1,
- NACT_PIVOT_BOOL,
- NACT_PIVOT_STRLIST
+ NA_PIVOT_STR = 1,
+ NA_PIVOT_BOOL,
+ NA_PIVOT_STRLIST
};
typedef struct {
@@ -95,10 +95,10 @@ typedef struct {
guint type;
gpointer data;
}
- NactPivotNotify;
+ NAPivotNotify;
-void nact_pivot_free_notify( NactPivotNotify *data );
+void na_pivot_free_notify( NAPivotNotify *data );
G_END_DECLS
-#endif /* __NACT_PIVOT_H__ */
+#endif /* __NA_PIVOT_H__ */
diff --git a/src/common/nact-uti-lists.c b/src/common/na-utils.c
similarity index 93%
rename from src/common/nact-uti-lists.c
rename to src/common/na-utils.c
index a5e9e14..5606b68 100644
--- a/src/common/nact-uti-lists.c
+++ b/src/common/na-utils.c
@@ -32,7 +32,7 @@
#include <config.h>
#endif
#include <glib-object.h>
-#include "nact-uti-lists.h"
+#include "na-utils.h"
/**
* Duplicates a GSList of strings.
@@ -40,7 +40,7 @@
* @list: the GSList to be duplicated.
*/
GSList *
-nactuti_duplicate_string_list( GSList *list )
+na_utils_duplicate_string_list( GSList *list )
{
GSList *duplist = NULL;
GSList *it;
@@ -57,7 +57,7 @@ nactuti_duplicate_string_list( GSList *list )
* @list: the GSList to be freed.
*/
void
-nactuti_free_string_list( GSList *list )
+na_utils_free_string_list( GSList *list )
{
GSList *item;
for( item = list ; item != NULL ; item = item->next ){
diff --git a/src/common/nact-uti-lists.h b/src/common/na-utils.h
similarity index 86%
rename from src/common/nact-uti-lists.h
rename to src/common/na-utils.h
index 9eba96c..4edf8ca 100644
--- a/src/common/nact-uti-lists.h
+++ b/src/common/na-utils.h
@@ -28,21 +28,21 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __NACT_UTI_LISTS_H__
-#define __NACT_UTI_LISTS_H__
-
-/*
- * Some functions to ease the GSList list manipulations.
- */
+#ifndef __NA_UTILS_H__
+#define __NA_UTILS_H__
#include <glib.h>
G_BEGIN_DECLS
-GSList *nactuti_duplicate_string_list( GSList *list );
+/*
+ * Some functions to ease the GSList list manipulations.
+ */
+
+GSList *na_utils_duplicate_string_list( GSList *list );
-void nactuti_free_string_list( GSList *list );
+void na_utils_free_string_list( GSList *list );
G_END_DECLS
-#endif /* __NACT_UTI_LISTS_H__ */
+#endif /* __NA_UTILS_H__ */
diff --git a/src/nact/nact-application.c b/src/nact/nact-application.c
index 35cb239..a2d3811 100644
--- a/src/nact/nact-application.c
+++ b/src/nact/nact-application.c
@@ -35,7 +35,7 @@
#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#include <common/nact-pivot.h>
+#include <common/na-pivot.h>
#include "nact.h"
#include "nact-application.h"
@@ -47,8 +47,8 @@ struct NactApplicationClassPrivate {
/* private instance data
*/
struct NactApplicationPrivate {
- gboolean dispose_has_run;
- NactPivot *pivot;
+ gboolean dispose_has_run;
+ NAPivot *pivot;
};
/* private instance properties
@@ -125,7 +125,7 @@ class_init( NactApplicationClass *klass )
spec = g_param_spec_pointer(
PROP_PIVOT_STR,
PROP_PIVOT_STR,
- "NactPivot object pointer",
+ "NAPivot object pointer",
G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE );
g_object_class_install_property( object_class, PROP_PIVOT, spec );
@@ -281,7 +281,7 @@ run_appli( NactApplication *application )
{
int code = 0;
- g_object_set( G_OBJECT( application ), PROP_PIVOT_STR, nact_pivot_new( NULL ), NULL );
+ g_object_set( G_OBJECT( application ), PROP_PIVOT_STR, na_pivot_new( NULL ), NULL );
g_object_set( G_OBJECT( application ), PROP_MAINWINDOW_STR, nact_init_dialog( G_OBJECT( application ), NULL );
diff --git a/src/nact/nact.c b/src/nact/nact.c
index 6382426..86523e5 100644
--- a/src/nact/nact.c
+++ b/src/nact/nact.c
@@ -42,9 +42,9 @@
#include <gtk/gtktreeview.h>
#include <glade/glade-xml.h>
-#include <common/nact-action.h>
-#include <common/nact-action-profile.h>
-#include <common/nact-pivot.h>
+#include <common/na-action.h>
+#include <common/na-action-profile.h>
+#include <common/na-pivot.h>
#include <common/nautilus-actions-config.h>
#include <common/nautilus-actions-config-gconf-writer.h>
@@ -66,7 +66,7 @@ void im_export_button_clicked_cb (GtkButton *button, gpointer user_data);
gboolean on_ActionsList_button_press_event( GtkWidget *widget, GdkEventButton *event, gpointer data );
static NactApplication *st_application = NULL;
-static NactPivot *st_pivot = NULL;
+static NAPivot *st_pivot = NULL;
static void list_selection_changed_cb (GtkTreeSelection *selection, gpointer user_data);
static void fill_actions_list( GtkWidget *list );
@@ -91,21 +91,21 @@ fill_actions_list (GtkWidget *list)
gtk_list_store_clear (model);
- actions = nact_pivot_get_label_sorted_actions( st_pivot );
+ actions = na_pivot_get_label_sorted_actions( st_pivot );
for( l = actions ; l != NULL ; l = l->next ){
GtkTreeIter iter;
GtkStockItem item;
GdkPixbuf* icon = NULL;
- NactAction *action = NACT_ACTION( l->data );
- gchar *uuid = nact_action_get_uuid( action );
- gchar *label = nact_action_get_label( action );
- gchar *iconname = nact_action_get_icon( action );
+ NAAction *action = NA_ACTION( l->data );
+ gchar *uuid = na_action_get_uuid( action );
+ gchar *label = na_action_get_label( action );
+ gchar *iconname = na_action_get_icon( action );
/* TODO: use the same algorythm than Nautilus to find and
- * display an icon + move the code to NactAction class +
- * remove nact_action_get_verified_icon_name
+ * display an icon + move the code to NAAction class +
+ * remove na_action_get_verified_icon_name
*/
if( icon ){
if( gtk_stock_lookup( iconname, &item )){
@@ -180,14 +180,14 @@ edit_button_clicked_cb (GtkButton *button, gpointer user_data)
if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
gchar *uuid;
- NactAction *action;
+ NAAction *action;
gtk_tree_model_get (model, &iter, UUID_COLUMN, &uuid, -1);
- action = NACT_ACTION( nact_pivot_get_action( st_pivot, uuid ));
+ action = NA_ACTION( na_pivot_get_action( st_pivot, uuid ));
if( action ){
- guint count = nact_action_get_profiles_count( action );
+ guint count = na_action_get_profiles_count( action );
if( count > 1 ){
if (nact_editor_edit_action (( NautilusActionsConfigAction *) action))
fill_actions_list (nact_actions_list);
@@ -218,21 +218,21 @@ duplicate_button_clicked_cb (GtkButton *button, gpointer user_data)
if (gtk_tree_selection_get_selected (selection, &model, &iter))
{
gchar *uuid;
- NactAction *action;
- NactAction* new_action;
+ NAAction *action;
+ NAAction* new_action;
gtk_tree_model_get (model, &iter, UUID_COLUMN, &uuid, -1);
- action = NACT_ACTION( nact_pivot_get_action( st_pivot, uuid ));
- new_action = nact_action_duplicate( action );
- nact_action_set_new_uuid( new_action );
+ action = NA_ACTION( na_pivot_get_action( st_pivot, uuid ));
+ new_action = na_action_duplicate( action );
+ na_action_set_new_uuid( new_action );
/*if( nautilus_actions_config_add_action( NAUTILUS_ACTIONS_CONFIG (config), new_action, &error )){*/
- if( nact_pivot_add_action( st_pivot, G_OBJECT( new_action ), &error )){
+ if( na_pivot_write_action( st_pivot, G_OBJECT( new_action ), &error )){
fill_actions_list (nact_actions_list);
} else {
/* i18n notes: will be displayed in a dialog */
- label = nact_action_get_label( action );
+ label = na_action_get_label( action );
tmp = g_strdup_printf (_("Can't duplicate action '%s'!"), label);
nautilus_actions_display_error( tmp, error );
g_free( error );
@@ -378,7 +378,7 @@ nact_init_dialog( GObject *application )
st_application = NACT_APPLICATION( application );
g_object_get( G_OBJECT( st_application ), "pivot", &st_pivot, NULL );
- g_assert( NACT_IS_PIVOT( st_pivot ));
+ g_assert( NA_IS_PIVOT( st_pivot ));
/*config = nautilus_actions_config_gconf_writer_get ();*/
diff --git a/src/plugin/nautilus-actions.c b/src/plugin/nautilus-actions.c
index c9b6228..f26f639 100644
--- a/src/plugin/nautilus-actions.c
+++ b/src/plugin/nautilus-actions.c
@@ -38,9 +38,10 @@
#include <libnautilus-extension/nautilus-file-info.h>
#include <libnautilus-extension/nautilus-menu-provider.h>
-#include <common/nact-action.h>
-#include <common/nact-action-profile.h>
-#include <common/nact-pivot.h>
+#include <common/na-action.h>
+#include <common/na-action-profile.h>
+#include <common/na-pivot.h>
+
#include "nautilus-actions.h"
/* private class data
@@ -51,10 +52,10 @@ struct NautilusActionsClassPrivate {
/* private instance data
*/
struct NautilusActionsPrivate {
- gboolean dispose_has_run;
+ gboolean dispose_has_run;
- /* from nact-pivot */
- NactPivot *pivot;
+ /* from na-pivot */
+ NAPivot *pivot;
};
/* We have a double stage notification system :
@@ -68,8 +69,8 @@ struct NautilusActionsPrivate {
* NautilusActions class
*
* This same signal is then first emitted by the IIOProvider to the
- * NactPivot object which handles it. When all modifications have been
- * treated, NactPivot notifies NautilusActions which itself asks
+ * NAPivot object which handles it. When all modifications have been
+ * treated, NAPivot notifies NautilusActions which itself asks
* Nautilus for updating its menu
*/
enum {
@@ -91,8 +92,8 @@ static void instance_finalize( GObject *object );
static GList *get_background_items( NautilusMenuProvider *provider, GtkWidget *window, NautilusFileInfo *current_folder );
static GList *get_file_items( NautilusMenuProvider *provider, GtkWidget *window, GList *files );
-static NautilusMenuItem *create_menu_item( NactAction *action, NactActionProfile *profile, GList *files );
-static void execute_action( NautilusMenuItem *item, NactActionProfile *profile );
+static NautilusMenuItem *create_menu_item( NAAction *action, NAActionProfile *profile, GList *files );
+static void execute_action( NautilusMenuItem *item, NAActionProfile *profile );
static void action_changed_handler( NautilusActions *instance, gpointer user_data );
GType
@@ -190,8 +191,8 @@ instance_init( GTypeInstance *instance, gpointer klass )
self->private = g_new0( NautilusActionsPrivate, 1 );
self->private->dispose_has_run = FALSE;
- /* from nact-pivot */
- self->private->pivot = nact_pivot_new( G_OBJECT( self ));
+ /* from na-pivot */
+ self->private->pivot = na_pivot_new( G_OBJECT( self ));
/* see nautilus_actions_class_init for why we had to connect an
* handler to our signal instead of relying on default handler
@@ -297,31 +298,31 @@ get_file_items( NautilusMenuProvider *provider, GtkWidget *window, GList *files
}
if( !self->private->dispose_has_run ){
- actions = nact_pivot_get_actions( self->private->pivot );
+ actions = na_pivot_get_actions( self->private->pivot );
for( ia = actions ; ia ; ia = ia->next ){
- NactAction *action = NACT_ACTION( ia->data );
+ NAAction *action = NA_ACTION( ia->data );
#ifdef NACT_MAINTAINER_MODE
- debug_label = nact_action_get_label( action );
+ debug_label = na_action_get_label( action );
g_debug( "%s: examining '%s' action", thisfn, debug_label );
g_free( debug_label );
#endif
- profiles = nact_action_get_profiles( action );
+ profiles = na_action_get_profiles( action );
for( ip = profiles ; ip ; ip = ip->next ){
- NactActionProfile *profile = NACT_ACTION_PROFILE( ip->data );
+ NAActionProfile *profile = NA_ACTION_PROFILE( ip->data );
#ifdef NACT_MAINTAINER_MODE
- debug_label = nact_action_profile_get_label( profile );
+ debug_label = na_action_profile_get_label( profile );
g_debug( "%s: examining '%s' profile", thisfn, debug_label );
g_free( debug_label );
#endif
- if( nact_action_profile_is_candidate( profile, files )){
+ if( na_action_profile_is_candidate( profile, files )){
item = create_menu_item( action, profile, files );
items = g_list_append( items, item );
break;
@@ -334,20 +335,20 @@ get_file_items( NautilusMenuProvider *provider, GtkWidget *window, GList *files
}
static NautilusMenuItem *
-create_menu_item( NactAction *action, NactActionProfile *profile, GList *files )
+create_menu_item( NAAction *action, NAActionProfile *profile, GList *files )
{
static const gchar *thisfn = "nautilus_actions_create_menu_item";
g_debug( "%s", thisfn );
NautilusMenuItem *item;
- gchar *uuid = nact_action_get_uuid( action );
+ gchar *uuid = na_action_get_uuid( action );
gchar *name = g_strdup_printf( "NautilusActions::%s", uuid );
- gchar *label = nact_action_get_label( action );
- gchar *tooltip = nact_action_get_tooltip( action );
- gchar* icon_name = nact_action_get_verified_icon_name( action );
+ gchar *label = na_action_get_label( action );
+ gchar *tooltip = na_action_get_tooltip( action );
+ gchar* icon_name = na_action_get_verified_icon_name( action );
- NactActionProfile *dup4menu = nact_action_profile_copy( profile );
+ NAActionProfile *dup4menu = na_action_profile_copy( profile );
item = nautilus_menu_item_new( name, label, tooltip, icon_name );
@@ -355,7 +356,7 @@ create_menu_item( NactAction *action, NactActionProfile *profile, GList *files )
"activate",
G_CALLBACK( execute_action ),
dup4menu,
- ( GClosureNotify ) nact_action_profile_free,
+ ( GClosureNotify ) na_action_profile_free,
0
);
@@ -375,7 +376,7 @@ create_menu_item( NactAction *action, NactActionProfile *profile, GList *files )
}
static void
-execute_action( NautilusMenuItem *item, NactActionProfile *profile )
+execute_action( NautilusMenuItem *item, NAActionProfile *profile )
{
static const gchar *thisfn = "nautilus_actions_execute_action";
g_debug( "%s: item=%p, profile=%p", thisfn, item, profile );
@@ -386,10 +387,10 @@ execute_action( NautilusMenuItem *item, NactActionProfile *profile )
files = ( GList* ) g_object_get_data( G_OBJECT( item ), "files" );
- path = nact_action_profile_get_path( profile );
+ path = na_action_profile_get_path( profile );
cmd = g_string_new( path );
- param = nact_action_profile_parse_parameters( profile, files );
+ param = na_action_profile_parse_parameters( profile, files );
if( param != NULL ){
g_string_append_printf( cmd, " %s", param );
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
