[nautilus-actions] Refactoring: rename src/core/na-object-id-class.h to src/api/na-object-id.h
- From: Pierre Wieser <pwieser src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus-actions] Refactoring: rename src/core/na-object-id-class.h to src/api/na-object-id.h
- Date: Fri, 19 Feb 2010 02:23:57 +0000 (UTC)
commit ec85db714d67d0c3d076c73eeae8e00b516b0810
Author: Pierre Wieser <pwieser trychlos org>
Date: Mon Feb 15 17:39:48 2010 +0100
Refactoring: rename src/core/na-object-id-class.h to src/api/na-object-id.h
ChangeLog | 1 +
src/api/Makefile.am | 1 +
.../na-object-id-class.h => api/na-object-id.h} | 41 +-
src/core/Makefile.am | 1 +
src/core/na-object-id.c | 613 ++------------------
5 files changed, 76 insertions(+), 581 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 0f2fe9d..00c9e95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
2009-02-15 Pierre Wieser <pwieser trychlos org>
+ Rename src/core/na-object-id-class.h to src/api/na-object-id.h
Rename src/core/na-object-class.h to src/api/na-object.h
Rename src/core/na-iduplicable.h to src/api/na-iduplicable.h
Rename src/core/na-gconf-utils.h to src/api/na-gconf-utils.h
diff --git a/src/api/Makefile.am b/src/api/Makefile.am
index ddc341b..80ce5c3 100644
--- a/src/api/Makefile.am
+++ b/src/api/Makefile.am
@@ -40,5 +40,6 @@ api_include_HEADERS = \
na-iduplicable.h \
na-object-api.h \
na-object.h \
+ na-object-id.h \
na-gconf-keys.h \
$(NULL)
diff --git a/src/core/na-object-id-class.h b/src/api/na-object-id.h
similarity index 64%
rename from src/core/na-object-id-class.h
rename to src/api/na-object-id.h
index b78aaf6..1817e05 100644
--- a/src/core/na-object-id-class.h
+++ b/src/api/na-object-id.h
@@ -28,22 +28,20 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_ID_CLASS_H__
-#define __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_ID_CLASS_H__
+#ifndef __NAUTILUS_ACTIONS_API_NA_OBJECT_ID_H__
+#define __NAUTILUS_ACTIONS_API_NA_OBJECT_ID_H__
/**
* SECTION: na_object_id
* @short_description: #NAObjectId class definition.
- * @include: nautilus-actions/private/na-object-id-class.h
+ * @include: nautilus-actions/na-object-id.h
*
- * A #NAObjectId object is characterized by :
- * - an internal identifiant (ASCII, case insensitive)
- * - a libelle (UTF8, localizable).
- *
- * The #NAObjectId class is a pure virtual class.
+ * This is a pure virtual class, i.e. not an instantiatable one.
+ * It serves as the base class for #NAObject-derived object which have
+ * a unique Id, i.e. for #NAObjectItem and #NAObjectProfile.
*/
-#include "na-object-class.h"
+#include "na-object.h"
G_BEGIN_DECLS
@@ -54,7 +52,7 @@ G_BEGIN_DECLS
#define NA_IS_OBJECT_ID_CLASS( klass ) ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NA_OBJECT_ID_TYPE ))
#define NA_OBJECT_ID_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NA_OBJECT_ID_TYPE, NAObjectIdClass ))
-typedef struct NAObjectIdPrivate NAObjectIdPrivate;
+typedef struct NAObjectIdPrivate NAObjectIdPrivate;
typedef struct {
NAObject parent;
@@ -67,29 +65,14 @@ typedef struct NAObjectIdClassPrivate NAObjectIdClassPrivate;
typedef struct {
NAObjectClass parent;
NAObjectIdClassPrivate *private;
-
- /**
- * new_id:
- * @object: a #NAObjectId object.
- * @new_parent: possibly the new #NAObjectId parent, or NULL.
- * If not NULL, this should actually be a #NAObjectItem.
- *
- * Returns: a new id suitable for this @object.
- *
- * If @object is a #NAObjectProfile, then @new_parent must be a
- * not null #NAObjectAction. This function ensures that the new
- * profile name does not already exist in the given @new_parent.
- *
- * This is a pure virtual function which should be implemented by
- * the actual class. Actually, we asks for the most-derived class
- * which implements this function.
- */
- gchar * ( *new_id )( const NAObjectId *object, const NAObjectId *new_parent );
}
NAObjectIdClass;
GType na_object_id_get_type( void );
+gint na_object_id_sort_alpha_asc ( const NAObjectId *a, const NAObjectId *b );
+gint na_object_id_sort_alpha_desc( const NAObjectId *a, const NAObjectId *b );
+
G_END_DECLS
-#endif /* __NAUTILUS_ACTIONS_NA_PRIVATE_OBJECT_ID_CLASS_H__ */
+#endif /* __NAUTILUS_ACTIONS_API_NA_OBJECT_ID_H__ */
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index de947d5..389f7ed 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -43,6 +43,7 @@ libna_core_la_SOURCES = \
na-iduplicable.c \
na-iio-provider.c \
na-object.c \
+ na-object-id.c \
\
na-iabout.c \
na-iabout.h \
diff --git a/src/core/na-object-id.c b/src/core/na-object-id.c
index fb314b0..f45d6bc 100644
--- a/src/core/na-object-id.c
+++ b/src/core/na-object-id.c
@@ -32,60 +32,42 @@
#include <config.h>
#endif
-#include <glib/gi18n.h>
-#include <string.h>
-
#include <api/na-object-api.h>
-#include "na-iduplicable.h"
-#include "na-object-id-priv.h"
-
/* private class data
*/
struct NAObjectIdClassPrivate {
void *empty; /* so that gcc -pedantic is happy */
};
-/* object properties
+/* private instance data
*/
-enum {
- NAOBJECT_ID_PROP_ID_ID = 1,
- NAOBJECT_ID_PROP_LABEL_ID
+struct NAObjectIdPrivate {
+ gboolean dispose_has_run;
+
+ gchar *id;
};
-/* instance properties
- */
-#define NAOBJECT_ID_PROP_ID "na-object-id"
-#define NAOBJECT_ID_PROP_LABEL "na-object-label"
+#define NA_OBJECT_PROP_ID "na-object-prop-id"
static NAObjectClass *st_parent_class = NULL;
-static GType register_type( void );
-static void class_init( NAObjectIdClass *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 object_dump( const NAObject *object);
-static void object_copy( NAObject *target, const NAObject *source );
-static gboolean object_are_equal( const NAObject *a, const NAObject *b );
-static gboolean object_is_valid( const NAObject *object );
-
-static gchar *v_new_id( const NAObjectId *object, const NAObjectId *new_parent );
-static gchar *most_derived_new_id( const NAObjectId *object, const NAObjectId *new_parent );
+static GType register_type( void );
+static void class_init( NAObjectIdClass *klass );
+static void instance_init( GTypeInstance *instance, gpointer klass );
+static void instance_dispose( GObject *object );
+static void instance_finalize( GObject *object );
GType
na_object_id_get_type( void )
{
- static GType object_type = 0;
+ static GType item_type = 0;
- if( !object_type ){
- object_type = register_type();
+ if( item_type == 0 ){
+ item_type = register_type();
}
- return( object_type );
+ return( item_type );
}
static GType
@@ -96,8 +78,8 @@ register_type( void )
static GTypeInfo info = {
sizeof( NAObjectIdClass ),
- ( GBaseInitFunc ) NULL,
- ( GBaseFinalizeFunc ) NULL,
+ NULL,
+ NULL,
( GClassInitFunc ) class_init,
NULL,
NULL,
@@ -119,7 +101,6 @@ class_init( NAObjectIdClass *klass )
static const gchar *thisfn = "na_object_id_class_init";
GObjectClass *object_class;
NAObjectClass *naobject_class;
- GParamSpec *spec;
g_debug( "%s: klass=%p", thisfn, ( void * ) klass );
@@ -128,126 +109,46 @@ class_init( NAObjectIdClass *klass )
object_class = G_OBJECT_CLASS( klass );
object_class->dispose = instance_dispose;
object_class->finalize = instance_finalize;
- object_class->set_property = instance_set_property;
- object_class->get_property = instance_get_property;
-
- spec = g_param_spec_string(
- NAOBJECT_ID_PROP_ID,
- "NAObjectId identifiant",
- "Internal identifiant of the NAObjectId object (ASCII, case insensitive)", "",
- G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE );
- g_object_class_install_property( object_class, NAOBJECT_ID_PROP_ID_ID, spec );
-
- spec = g_param_spec_string(
- NAOBJECT_ID_PROP_LABEL,
- "NAObjectId libelle",
- "Libelle of the NAObjectId object (UTF-8, localizable)", "",
- G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE );
- g_object_class_install_property( object_class, NAOBJECT_ID_PROP_LABEL_ID, spec );
-
- klass->private = g_new0( NAObjectIdClassPrivate, 1 );
naobject_class = NA_OBJECT_CLASS( klass );
- naobject_class->dump = object_dump;
- naobject_class->new = NULL;
- naobject_class->copy = object_copy;
- naobject_class->are_equal = object_are_equal;
- naobject_class->is_valid = object_is_valid;
- naobject_class->get_childs = NULL;
- naobject_class->ref = NULL;
- naobject_class->unref = NULL;
-
- klass->new_id = NULL;
+ naobject_class->dump = NULL;
+ naobject_class->copy = NULL;
+ naobject_class->are_equal = NULL;
+ naobject_class->is_valid = NULL;
+
+ klass->private = g_new0( NAObjectIdClassPrivate, 1 );
}
static void
instance_init( GTypeInstance *instance, gpointer klass )
{
- /*static const gchar *thisfn = "na_object_id_instance_init";*/
+ static const gchar *thisfn = "na_object_id_instance_init";
NAObjectId *self;
- /*g_debug( "%s: instance=%p, klass=%p", thisfn, ( void * ) instance, ( void * ) klass );*/
+ g_debug( "%s: instance=%p (%s), klass=%p",
+ thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ), ( void * ) klass );
+
g_return_if_fail( NA_IS_OBJECT_ID( instance ));
+
self = NA_OBJECT_ID( instance );
self->private = g_new0( NAObjectIdPrivate, 1 );
-
- self->private->dispose_has_run = FALSE;
}
static void
-instance_get_property( GObject *object, guint property_id, GValue *value, GParamSpec *spec )
+instance_dispose( GObject *object )
{
+ static const gchar *thisfn = "na_object_id_instance_dispose";
NAObjectId *self;
- g_return_if_fail( NA_IS_OBJECT_ID( object ));
- self = NA_OBJECT_ID( object );
-
- if( !self->private->dispose_has_run ){
-
- switch( property_id ){
- case NAOBJECT_ID_PROP_ID_ID:
- g_value_set_string( value, self->private->id );
- break;
-
- case NAOBJECT_ID_PROP_LABEL_ID:
- g_value_set_string( value, self->private->label );
- break;
-
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID( object, property_id, spec );
- break;
- }
- }
-}
-
-static void
-instance_set_property( GObject *object, guint property_id, const GValue *value, GParamSpec *spec )
-{
- NAObjectId *self;
+ g_debug( "%s: object=%p (%s)", thisfn, ( void * ) object, G_OBJECT_TYPE_NAME( object ));
g_return_if_fail( NA_IS_OBJECT_ID( object ));
- self = NA_OBJECT_ID( object );
-
- if( !self->private->dispose_has_run ){
-
- switch( property_id ){
- case NAOBJECT_ID_PROP_ID_ID:
- g_free( self->private->id );
- self->private->id = g_value_dup_string( value );
- break;
-
- case NAOBJECT_ID_PROP_LABEL_ID:
- g_free( self->private->label );
- self->private->label = g_value_dup_string( value );
- break;
-
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID( object, property_id, spec );
- break;
- }
- }
-}
-static void
-instance_dispose( GObject *object )
-{
- /*static const gchar *thisfn = "na_object_id_instance_dispose";*/
- NAObjectId *self;
-
- /*g_debug( "%s: object=%p", thisfn, ( void * ) object );*/
- g_return_if_fail( NA_IS_OBJECT_ID( object ));
self = NA_OBJECT_ID( object );
if( !self->private->dispose_has_run ){
- if( self->private->parent ){
- /*g_debug( "na_object_id_instance_dispose: object=%p, parent=%p",
- ( void * ) object, ( void * ) self->private->parent );*/
- na_object_remove_item( self->private->parent, object );
- self->private->parent = NULL;
- }
-
self->private->dispose_has_run = TRUE;
/* chain up to the parent class */
@@ -263,10 +164,10 @@ instance_finalize( GObject *object )
NAObjectId *self;
g_return_if_fail( NA_IS_OBJECT_ID( object ));
+
self = NA_OBJECT_ID( object );
g_free( self->private->id );
- g_free( self->private->label );
g_free( self->private );
@@ -277,440 +178,48 @@ instance_finalize( GObject *object )
}
/**
- * na_object_id_check_status_up:
- * @object: the object at the start of the hierarchy.
- *
- * Checks for modification and validity status of the @object, its
- * parent, the parent of its parent, etc. up to the top of the hierarchy.
- *
- * Returns: %TRUE if at least one of the status has changed, %FALSE else.
- *
- * Checking the modification of any of the status should be more
- * efficient that systematically force the display of the item.
- */
-gboolean
-na_object_id_check_status_up( NAObjectId *object )
-{
- gboolean changed;
- gboolean was_modified, is_modified;
- gboolean was_valid, is_valid;
-
- g_return_val_if_fail( NA_OBJECT_ID( object ), FALSE );
-
- changed = FALSE;
-
- if( !object->private->dispose_has_run ){
-
- was_modified = na_object_is_modified( object );
- was_valid = na_object_is_valid( object );
-
- na_iduplicable_check_status( NA_IDUPLICABLE( object ));
-
- is_modified = na_object_is_modified( object );
- is_valid = na_object_is_valid( object );
-
- if( object->private->parent ){
- na_object_id_check_status_up( NA_OBJECT_ID( object->private->parent ));
- }
-
- changed =
- ( was_modified && !is_modified ) ||
- ( !was_modified && is_modified ) ||
- ( was_valid && !is_valid ) ||
- ( !was_valid && is_valid );
- }
-
- return( changed );
-}
-
-/**
- * na_object_id_get_id:
- * @object: the #NAObjectId object whose internal identifiant is
- * requested.
- *
- * Returns: the internal identifiant of @object as a new string.
- *
- * The returned string is an ASCII, case insensitive, string.
- * It should be g_free() by the caller.
- */
-gchar *
-na_object_id_get_id( const NAObjectId *object )
-{
- gchar *id = NULL;
-
- g_return_val_if_fail( NA_IS_OBJECT_ID( object ), NULL );
-
- if( !object->private->dispose_has_run ){
- g_object_get( G_OBJECT( object ), NAOBJECT_ID_PROP_ID, &id, NULL );
- }
-
- return( id );
-}
-
-/**
- * na_object_id_get_label:
- * @object: the #NAObjectId object whose label is requested.
- *
- * Returns: the label of @object as a new string.
- *
- * The returned string is an UTF_8 localizable string.
- * It should be g_free() by the caller.
- */
-gchar *
-na_object_id_get_label( const NAObjectId *object )
-{
- gchar *label = NULL;
-
- g_return_val_if_fail( NA_IS_OBJECT_ID( object ), NULL );
-
- if( !object->private->dispose_has_run ){
- g_object_get( G_OBJECT( object ), NAOBJECT_ID_PROP_LABEL, &label, NULL );
- }
-
- return( label );
-}
-
-/**
- * na_object_id_get_parent:
- * @object: the #NAObjectId whose parent is to be retrieved.
- *
- * Returns: the #NAObjectItem parent, or NULL.
- */
-NAObjectItem *
-na_object_id_get_parent( NAObjectId *object )
-{
- NAObjectItem *parent = NULL;
-
- g_return_val_if_fail( NA_IS_OBJECT_ID( object ), NULL );
-
- if( !object->private->dispose_has_run ){
- parent = object->private->parent;
- }
-
- return( parent );
-}
-
-/**
- * na_object_id_get_topmost_parent:
- * @object: the #NAObject whose parent is searched.
- *
- * Returns: the topmost parent, maybe @object itself.
- */
-NAObjectId *
-na_object_id_get_topmost_parent( NAObjectId *object )
-{
- NAObjectId *parent;
-
- g_return_val_if_fail( NA_IS_OBJECT_ID( object ), NULL );
-
- parent = object;
-
- if( !object->private->dispose_has_run ){
-
- while( parent->private->parent ){
- parent = NA_OBJECT_ID( parent->private->parent );
- }
- }
-
- return( parent );
-}
-
-/**
- * na_object_id_set_id:
- * @object: the #NAObjectId object whose internal identifiant is to be
- * set.
- * @id: internal identifiant to be set.
+ * na_object_id_sort_alpha_asc:
+ * @a: first #NAObjectId.
+ * @b: second #NAObjectId.
*
- * Sets the internal identifiant of @object by taking a copy of the
- * provided one.
- */
-void
-na_object_id_set_id( NAObjectId *object, const gchar *id )
-{
- g_return_if_fail( NA_IS_OBJECT_ID( object ));
-
- if( !object->private->dispose_has_run ){
- g_object_set( G_OBJECT( object ), NAOBJECT_ID_PROP_ID, id, NULL );
- }
-}
-
-/**
- * na_object_id_set_new_id:
- * @object: the #NAObjectId object whose internal identifiant is to be
- * set.
- * @new_parent: if @object is a #NAObjectProfile, then @new_parent
- * should be set to the #NAObjectActio new parent. Else, it would not
- * be possible to allocate a new profile id compatible with already
- * existing ones.
+ * Sort the objects in alphabetical ascending order of their label.
*
- * Request a new id to the derived class, and set it.
+ * Returns:
+ * -1 if @a must be sorted before @b,
+ * 0 if @a and @b are equal from the local point of view,
+ * 1 if @a must be sorted after @b.
*/
-void
-na_object_id_set_new_id( NAObjectId *object, const NAObjectId *new_parent )
+gint
+na_object_id_sort_alpha_asc( const NAObjectId *a, const NAObjectId *b )
{
- gchar *id;
-
- g_return_if_fail( NA_IS_OBJECT_ID( object ));
- g_return_if_fail( !new_parent || NA_IS_OBJECT_ID( new_parent ));
-
- if( !object->private->dispose_has_run ){
+ gchar *label_a, *label_b;
+ gint compare;
- id = v_new_id( object, new_parent );
-
- if( id ){
- g_object_set( G_OBJECT( object ), NAOBJECT_ID_PROP_ID, id, NULL );
- g_free( id );
- }
- }
-}
-
-/**
- * na_object_id_set_label:
- * @object: the #NAObjectId object whose label is to be set.
- * @label: label to be set.
- *
- * Sets the label of @object by taking a copy of the provided one.
- */
-void
-na_object_id_set_label( NAObjectId *object, const gchar *label )
-{
- g_return_if_fail( NA_IS_OBJECT_ID( object ));
+ label_a = na_object_get_label( a );
+ label_b = na_object_get_label( b );
- if( !object->private->dispose_has_run ){
- g_object_set( G_OBJECT( object ), NAOBJECT_ID_PROP_LABEL, label, NULL );
- }
-}
+ compare = g_utf8_collate( label_a, label_b );
-/**
- * na_object_id_set_parent:
- * @object: this #NAObjectId object.
- * @parent: the #NAObjectItem parent to be set, or NULL.
- *
- * Store a pointer to the parent.
- */
-void
-na_object_id_set_parent( NAObjectId *object, NAObjectItem *parent )
-{
- g_return_if_fail( NA_IS_OBJECT_ID( object ));
- g_return_if_fail( NA_IS_OBJECT_ITEM( parent ) || !parent );
+ g_free( label_b );
+ g_free( label_a );
- if( !object->private->dispose_has_run ){
- object->private->parent = parent;
- }
+ return( compare );
}
/**
- * na_object_id_prepare_for_paste:
- * @object: the #NAObjectId object to be pasted.
- * @relabel: whether this object should be relabeled when pasted.
- * @relabel: whether this item should be renumbered ?
- * @action: if @object is a #NAObjectProfile, the attached #NAObjectAction.
- *
- * Prepares @object to be pasted.
+ * na_object_id_sort_alpha_desc:
+ * @a: first #NAObjectId.
+ * @b: second #NAObjectId.
*
- * If a #NAObjectProfile, then @object is attached to the specified
- * #NAObjectAction @action. The identifier is always renumbered to be
- * suitable with the already existing profiles.
+ * Sort the objects in alphabetical descending order of their label.
*
- * If a #NAObjectAction or a #NAObjectMenu, a new UUID is allocated if
- * and only if @relabel is %TRUE.
- *
- * Actual relabeling takes place if @relabel is %TRUE, depending of the
- * user preferences.
+ * Returns:
+ * -1 if @a must be sorted before @b,
+ * 0 if @a and @b are equal from the local point of view,
+ * 1 if @a must be sorted after @b.
*/
-void
-na_object_id_prepare_for_paste( NAObjectId *object, gboolean relabel, gboolean renumber, NAObjectAction *action )
+gint
+na_object_id_sort_alpha_desc( const NAObjectId *a, const NAObjectId *b )
{
- static const gchar *thisfn = "na_object_id_prepare_for_paste";
- GList *subitems, *it;
-
- g_debug( "%s: object=%p, relabel=%s, renumber=%s, action=%p",
- thisfn, ( void * ) object, relabel ? "True":"False", renumber ? "True":"False", ( void * ) action );
- g_return_if_fail( NA_IS_OBJECT_ID( object ));
- g_return_if_fail( !action || NA_IS_OBJECT_ACTION( action ));
-
- if( !object->private->dispose_has_run ){
-
- if( NA_IS_OBJECT_PROFILE( object )){
- na_object_set_parent( object, action );
- na_object_set_new_id( object, action );
- if( renumber && relabel ){
- na_object_set_copy_of_label( object );
- }
-
- } else {
- if( renumber ){
- na_object_set_new_id( object, NULL );
- if( relabel ){
- na_object_set_copy_of_label( object );
- }
- na_object_set_provider( object, NULL );
- na_object_set_readonly( object, FALSE );
- }
- if( NA_IS_OBJECT_MENU( object )){
- subitems = na_object_get_items_list( object );
- for( it = subitems ; it ; it = it->next ){
- na_object_prepare_for_paste( it->data, relabel, renumber, NULL );
- }
- }
- }
- }
-}
-
-/**
- * na_object_id_set_copy_of_label:
- * @object: the #NAObjectId object whose label is to be changed.
- *
- * Sets the 'Copy of' label.
- */
-void
-na_object_id_set_copy_of_label( NAObjectId *object )
-{
- gchar *new_label;
-
- g_return_if_fail( NA_IS_OBJECT_ID( object ));
-
- if( !object->private->dispose_has_run ){
-
- /* i18n: copied items have a label as 'Copy of original label' */
- new_label = g_strdup_printf( _( "Copy of %s" ), object->private->label );
- g_free( object->private->label );
- object->private->label = new_label;
- }
-}
-
-static void
-object_dump( const NAObject *object )
-{
- static const char *thisfn = "na_object_id_object_dump";
-
- g_return_if_fail( NA_IS_OBJECT_ID( object ));
-
- if( !NA_OBJECT_ID( object )->private->dispose_has_run ){
-
- g_debug( "%s: parent=%p", thisfn, ( void * ) NA_OBJECT_ID( object )->private->parent );
- g_debug( "%s: id=%s", thisfn, NA_OBJECT_ID( object )->private->id );
- g_debug( "%s: label=%s", thisfn, NA_OBJECT_ID( object )->private->label );
- }
-}
-
-static void
-object_copy( NAObject *target, const NAObject *source )
-{
- gchar *id, *label;
-
- g_return_if_fail( NA_IS_OBJECT_ID( target ));
- g_return_if_fail( NA_IS_OBJECT_ID( source ));
-
- if( !NA_OBJECT_ID( target )->private->dispose_has_run &&
- !NA_OBJECT_ID( source )->private->dispose_has_run ){
-
- g_object_get( G_OBJECT( source ),
- NAOBJECT_ID_PROP_ID, &id,
- NAOBJECT_ID_PROP_LABEL, &label,
- NULL );
-
- g_object_set( G_OBJECT( target ),
- NAOBJECT_ID_PROP_ID, id,
- NAOBJECT_ID_PROP_LABEL, label,
- NULL );
-
- g_free( id );
- g_free( label );
- }
-}
-
-/*
- * note that parent is not pertinent here, as two objects may be
- * considered as equal even if they not have the same parent
- * (and typically when we compare a duplicated object in the treeview
- * against its origin in the pivot !)
- */
-static gboolean
-object_are_equal( const NAObject *a, const NAObject *b )
-{
- gboolean equal = TRUE;
-
- g_return_val_if_fail( NA_IS_OBJECT_ID( a ), FALSE );
- g_return_val_if_fail( NA_IS_OBJECT_ID( b ), FALSE );
-
- if( !NA_OBJECT_ID( a )->private->dispose_has_run &&
- !NA_OBJECT_ID( b )->private->dispose_has_run ){
-
- if( equal ){
- if( g_ascii_strcasecmp( NA_OBJECT_ID( a )->private->id, NA_OBJECT_ID( b )->private->id )){
- /*g_debug( "a->id=%s, b->id=%s", NA_OBJECT_ID( a )->private->id, NA_OBJECT_ID( b )->private->id );*/
- equal = FALSE;
- }
- }
-
- if( equal ){
- if( g_utf8_collate( NA_OBJECT_ID( a )->private->label, NA_OBJECT_ID( b )->private->label )){
- /*g_debug( "a->label=%s, b->label=%s", NA_OBJECT_ID( a )->private->label, NA_OBJECT_ID( b )->private->label );*/
- equal = FALSE;
- }
- }
-
- /*g_debug( "na_object_id_object_are_equal: a=%p (%s), b=%p (%s), are_equal=%s",
- ( void * ) a, G_OBJECT_TYPE_NAME( a ),
- ( void * ) b, G_OBJECT_TYPE_NAME( b ),
- equal ? "True":"False" );*/
- }
-
- return( equal );
-}
-
-/*
- * from NAObjectId point of view, a valid object requires an id
- * (not null, not empty)
- */
-static gboolean
-object_is_valid( const NAObject *object )
-{
- gboolean valid = TRUE;
-
- g_return_val_if_fail( NA_IS_OBJECT_ID( object ), FALSE );
-
- if( !NA_OBJECT_ID( object )->private->dispose_has_run ){
-
- if( valid ){
- valid = ( NA_OBJECT_ID( object )->private->id && strlen( NA_OBJECT_ID( object )->private->id ));
- }
- }
-
- return( valid );
-}
-
-static gchar *
-v_new_id( const NAObjectId *object, const NAObjectId *new_parent )
-{
- return( most_derived_new_id( object, new_parent ));
-}
-
-static gchar *
-most_derived_new_id( const NAObjectId *object, const NAObjectId *new_parent )
-{
- gchar *new_id;
- GList *hierarchy, *ih;
- gboolean found;
-
- found = FALSE;
- new_id = NULL;
- hierarchy = g_list_reverse( na_object_get_hierarchy( NA_OBJECT( object )));
- /*g_debug( "na_object_id_most_derived_id: object=%p (%s)",
- ( void * ) object, G_OBJECT_TYPE_NAME( object ));*/
-
- for( ih = hierarchy ; ih && !found ; ih = ih->next ){
- if( NA_OBJECT_ID_CLASS( ih->data )->new_id ){
- new_id = NA_OBJECT_ID_CLASS( ih->data )->new_id( object, new_parent );
- found = TRUE;
- }
- if( G_OBJECT_CLASS_TYPE( ih->data ) == NA_OBJECT_ID_TYPE ){
- break;
- }
- }
-
- na_object_free_hierarchy( hierarchy );
-
- return( new_id );
+ return( -1 * na_object_id_sort_alpha_asc( a, b ));
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
