Commit df773d3c authored by Pierre Wieser's avatar Pierre Wieser

Review debug messages in core library

parent 8bf96129
......@@ -317,11 +317,11 @@ instance_init( GTypeInstance *instance, gpointer klass )
static const gchar *thisfn = "na_data_boxed_instance_init";
NADataBoxed *self;
g_return_if_fail( NA_IS_DATA_BOXED( instance ));
g_debug( "%s: instance=%p (%s), klass=%p",
thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ), ( void * ) klass );
g_return_if_fail( NA_IS_DATA_BOXED( instance ));
self = NA_DATA_BOXED( instance );
self->private = g_new0( NADataBoxedPrivate, 1 );
......@@ -335,17 +335,17 @@ instance_dispose( GObject *object )
static const gchar *thisfn = "na_data_boxed_instance_dispose";
NADataBoxed *self;
g_debug( "%s: object=%p (%s), name=%s",
thisfn,
( void * ) object, G_OBJECT_TYPE_NAME( object ),
NA_DATA_BOXED( object )->private->def->name );
g_return_if_fail( NA_IS_DATA_BOXED( object ));
self = NA_DATA_BOXED( object );
if( !self->private->dispose_has_run ){
g_debug( "%s: object=%p (%s), name=%s",
thisfn,
( void * ) object, G_OBJECT_TYPE_NAME( object ),
NA_DATA_BOXED( object )->private->def->name );
self->private->dispose_has_run = TRUE;
/* chain up to the parent class */
......@@ -411,6 +411,8 @@ na_data_boxed_get_param_spec( const NADataDef *def )
GParamSpec *spec;
DataBoxedFn *fn;
g_return_val_if_fail( def != NULL, NULL );
spec = NULL;
fn = get_data_boxed_fn( def->type );
......
......@@ -117,9 +117,10 @@ instance_init( GTypeInstance *instance, gpointer klass )
static const gchar *thisfn = "na_export_format_instance_init";
NAExportFormat *self;
g_return_if_fail( NA_IS_EXPORT_FORMAT( instance ));
g_debug( "%s: instance=%p (%s), klass=%p",
thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ), ( void * ) klass );
g_return_if_fail( NA_IS_EXPORT_FORMAT( instance ));
self = NA_EXPORT_FORMAT( instance );
self->private = g_new0( NAExportFormatPrivate, 1 );
......@@ -133,12 +134,14 @@ instance_dispose( GObject *object )
static const gchar *thisfn = "na_export_format_instance_dispose";
NAExportFormat *self;
g_debug( "%s: object=%p (%s)", thisfn, ( void * ) object, G_OBJECT_TYPE_NAME( object ));
g_return_if_fail( NA_IS_EXPORT_FORMAT( object ));
self = NA_EXPORT_FORMAT( object );
if( !self->private->dispose_has_run ){
g_debug( "%s: object=%p (%s)", thisfn, ( void * ) object, G_OBJECT_TYPE_NAME( object ));
self->private->dispose_has_run = TRUE;
/* chain up to the parent class */
......@@ -154,8 +157,9 @@ instance_finalize( GObject *object )
static const gchar *thisfn = "na_export_format_instance_finalize";
NAExportFormat *self;
g_debug( "%s: object=%p", thisfn, ( void * ) object );
g_return_if_fail( NA_IS_EXPORT_FORMAT( object ));
g_debug( "%s: object=%p", thisfn, ( void * ) object );
self = NA_EXPORT_FORMAT( object );
g_free( self->private );
......
......@@ -62,6 +62,8 @@ na_exporter_get_formats( const NAPivot *pivot )
const NAIExporterFormat *str;
NAExportFormat *format;
g_return_val_if_fail( NA_IS_PIVOT( pivot ), NULL );
formats = NULL;
if( iexporter_initialized && !iexporter_finalized ){
......@@ -124,17 +126,17 @@ na_exporter_to_buffer( const NAPivot *pivot, const NAObjectItem *item, GQuark fo
g_return_val_if_fail( NA_IS_PIVOT( pivot ), NULL );
g_return_val_if_fail( NA_IS_OBJECT_ITEM( item ), NULL );
g_debug( "%s: pivot=%p, item=%p (%s), format=%u (%s), messages=%p",
thisfn,
( void * ) pivot,
( void * ) item, G_OBJECT_TYPE_NAME( item ),
( guint ) format, g_quark_to_string( format ),
( void * ) messages );
buffer = NULL;
if( iexporter_initialized && !iexporter_finalized ){
g_debug( "%s: pivot=%p, item=%p (%s), format=%u (%s), messages=%p",
thisfn,
( void * ) pivot,
( void * ) item, G_OBJECT_TYPE_NAME( item ),
( guint ) format, g_quark_to_string( format ),
( void * ) messages );
exporter = find_exporter_for_format( pivot, format );
g_debug( "%s: exporter=%p (%s)", thisfn, ( void * ) exporter, G_OBJECT_TYPE_NAME( exporter ));
......@@ -196,18 +198,18 @@ na_exporter_to_file( const NAPivot *pivot, const NAObjectItem *item, const gchar
g_return_val_if_fail( NA_IS_PIVOT( pivot ), NULL );
g_return_val_if_fail( NA_IS_OBJECT_ITEM( item ), NULL );
g_debug( "%s: pivot=%p, item=%p (%s), folder=%s, format=%u (%s), messages=%p",
thisfn,
( void * ) pivot,
( void * ) item, G_OBJECT_TYPE_NAME( item ),
folder,
( guint ) format, g_quark_to_string( format ),
( void * ) messages );
export_uri = NULL;
if( iexporter_initialized && !iexporter_finalized ){
g_debug( "%s: pivot=%p, item=%p (%s), folder=%s, format=%u (%s), messages=%p",
thisfn,
( void * ) pivot,
( void * ) item, G_OBJECT_TYPE_NAME( item ),
folder,
( guint ) format, g_quark_to_string( format ),
( void * ) messages );
exporter = find_exporter_for_format( pivot, format );
if( exporter ){
......
......@@ -607,10 +607,10 @@ na_factory_object_read_item( NAIFactoryObject *serializable, const NAIFactoryPro
{
static const gchar *thisfn = "na_factory_object_read_item";
if( ifactory_object_initialized && !ifactory_object_finalized ){
g_return_if_fail( NA_IS_IFACTORY_OBJECT( serializable ));
g_return_if_fail( NA_IS_IFACTORY_PROVIDER( reader ));
g_return_if_fail( NA_IS_IFACTORY_OBJECT( serializable ));
g_return_if_fail( NA_IS_IFACTORY_PROVIDER( reader ));
if( ifactory_object_initialized && !ifactory_object_finalized ){
NADataGroup *groups = v_get_groups( serializable );
......
......@@ -123,9 +123,10 @@ instance_init( GTypeInstance *instance, gpointer klass )
static const gchar *thisfn = "na_gconf_monitor_instance_init";
NAGConfMonitor *self;
g_return_if_fail( NA_IS_GCONF_MONITOR( instance ));
g_debug( "%s: instance=%p (%s), klass=%p",
thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ), ( void * ) klass );
g_return_if_fail( NA_IS_GCONF_MONITOR( instance ));
self = NA_GCONF_MONITOR( instance );
self->private = g_new0( NAGConfMonitorPrivate, 1 );
......@@ -141,12 +142,14 @@ instance_dispose( GObject *object )
static const gchar *thisfn = "na_gconf_monitor_instance_dispose";
NAGConfMonitor *self;
g_debug( "%s: object=%p (%s)", thisfn, ( void * ) object, G_OBJECT_TYPE_NAME( object ));
g_return_if_fail( NA_IS_GCONF_MONITOR( object ));
self = NA_GCONF_MONITOR( object );
if( !self->private->dispose_has_run ){
g_debug( "%s: object=%p (%s)", thisfn, ( void * ) object, G_OBJECT_TYPE_NAME( object ));
/* release the installed monitor before setting dispose_has_run */
release_monitor( self );
......@@ -269,11 +272,12 @@ release_monitor( NAGConfMonitor *monitor )
static const gchar *thisfn = "na_gconf_monitor_release_monitor";
GError *error = NULL;
g_debug( "%s: monitor=%p", thisfn, ( void * ) monitor );
g_return_if_fail( NA_IS_GCONF_MONITOR( monitor ));
if( !monitor->private->dispose_has_run ){
g_debug( "%s: monitor=%p", thisfn, ( void * ) monitor );
if( monitor->private->monitor_id ){
gconf_client_notify_remove( monitor->private->gconf, monitor->private->monitor_id );
}
......
......@@ -255,16 +255,16 @@ na_iduplicable_duplicate( const NAIDuplicable *object )
NAIDuplicable *dup;
DuplicableStr *dup_str, *obj_str;
g_debug( "%s: object=%p (%s)",
thisfn,
( void * ) object, G_OBJECT_TYPE_NAME( object ));
g_return_val_if_fail( NA_IS_IDUPLICABLE( object ), NULL );
dup = NULL;
if( st_initialized && !st_finalized ){
g_debug( "%s: object=%p (%s)",
thisfn,
( void * ) object, G_OBJECT_TYPE_NAME( object ));
dup = g_object_new( G_OBJECT_TYPE( object ), NULL );
v_copy( dup, object );
......@@ -531,10 +531,12 @@ v_is_valid( const NAIDuplicable *object )
void
na_iduplicable_register_consumer( GObject *consumer )
{
g_return_if_fail( st_interface );
if( st_initialized && !st_finalized ){
g_return_if_fail( st_interface );
g_debug( "na_iduplicable_register_consumer: consumer=%p", ( void * ) consumer );
st_interface->private->consumers = g_list_prepend( st_interface->private->consumers, consumer );
}
}
......
......@@ -162,9 +162,6 @@ na_ifactory_provider_read_item( const NAIFactoryProvider *reader, void *reader_d
if( ifactory_provider_initialized && !ifactory_provider_finalized ){
g_return_if_fail( NA_IS_IFACTORY_PROVIDER( reader ));
g_return_if_fail( NA_IS_IFACTORY_OBJECT( object ));
v_factory_provider_read_start( reader, reader_data, object, messages );
na_factory_object_read_item( object, reader, reader_data, messages );
v_factory_provider_read_done( reader, reader_data, object, messages );
......@@ -192,13 +189,13 @@ na_ifactory_provider_write_item( const NAIFactoryProvider *writer, void *writer_
g_return_val_if_fail( NA_IS_IFACTORY_PROVIDER( writer ), NA_IIO_PROVIDER_CODE_PROGRAM_ERROR );
g_return_val_if_fail( NA_IS_IFACTORY_OBJECT( object ), NA_IIO_PROVIDER_CODE_PROGRAM_ERROR );
g_debug( "%s: writer=%p, writer_data=%p, object=%p (%s)",
thisfn, ( void * ) writer, ( void * ) writer_data, ( void * ) object, G_OBJECT_TYPE_NAME( object ));
code = NA_IIO_PROVIDER_CODE_NOT_WILLING_TO_RUN;
if( ifactory_provider_initialized && !ifactory_provider_finalized ){
g_debug( "%s: writer=%p, writer_data=%p, object=%p (%s)",
thisfn, ( void * ) writer, ( void * ) writer_data, ( void * ) object, G_OBJECT_TYPE_NAME( object ));
code = v_factory_provider_write_start( writer, writer_data, object, messages );
if( code == NA_IIO_PROVIDER_CODE_OK ){
......
......@@ -138,10 +138,11 @@ instance_init( GTypeInstance *instance, gpointer klass )
NAImporterAsk *self;
GError *error;
g_return_if_fail( NA_IS_IMPORTER_ASK( instance ));
g_debug( "%s: instance=%p (%s), klass=%p",
thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ), ( void * ) klass );
g_return_if_fail( NA_IS_IMPORTER_ASK( instance ));
self = NA_IMPORTER_ASK( instance );
self->private = g_new0( NAImporterAskPrivate, 1 );
......@@ -169,13 +170,14 @@ instance_dispose( GObject *dialog )
static const gchar *thisfn = "na_importer_ask_instance_dispose";
NAImporterAsk *self;
g_debug( "%s: dialog=%p (%s)", thisfn, ( void * ) dialog, G_OBJECT_TYPE_NAME( dialog ));
g_return_if_fail( NA_IS_IMPORTER_ASK( dialog ));
self = NA_IMPORTER_ASK( dialog );
if( !self->private->dispose_has_run ){
g_debug( "%s: dialog=%p (%s)", thisfn, ( void * ) dialog, G_OBJECT_TYPE_NAME( dialog ));
self->private->dispose_has_run = TRUE;
g_object_unref( self->private->gconf );
......@@ -194,8 +196,9 @@ instance_finalize( GObject *dialog )
static const gchar *thisfn = "na_importer_ask_instance_finalize";
NAImporterAsk *self;
g_debug( "%s: dialog=%p", thisfn, ( void * ) dialog );
g_return_if_fail( NA_IS_IMPORTER_ASK( dialog ));
g_debug( "%s: dialog=%p", thisfn, ( void * ) dialog );
self = NA_IMPORTER_ASK( dialog );
g_free( self->private );
......
......@@ -59,12 +59,12 @@ na_importer_import_from_uri( const NAPivot *pivot, NAIImporterUriParms *parms )
g_return_val_if_fail( NA_IS_PIVOT( pivot ), IMPORTER_CODE_PROGRAM_ERROR );
g_debug( "%s: pivot=%p, parms=%p", thisfn, ( void * ) pivot, ( void * ) parms );
code = IMPORTER_CODE_PROGRAM_ERROR;
if( iimporter_initialized && !iimporter_finalized ){
g_debug( "%s: pivot=%p, parms=%p", thisfn, ( void * ) pivot, ( void * ) parms );
code = IMPORTER_CODE_NOT_WILLING_TO;
modules = na_pivot_get_providers( pivot, NA_IIMPORTER_TYPE );
......@@ -106,13 +106,13 @@ na_importer_import_from_list( const NAPivot *pivot, NAIImporterListParms *parms
g_return_val_if_fail( NA_IS_PIVOT( pivot ), IMPORTER_CODE_PROGRAM_ERROR );
g_debug( "%s: pivot=%p, parms=%p", thisfn, ( void * ) pivot, ( void * ) parms );
code = IMPORTER_CODE_PROGRAM_ERROR;
parms->imported = NULL;
if( iimporter_initialized && !iimporter_finalized ){
g_debug( "%s: pivot=%p, parms=%p", thisfn, ( void * ) pivot, ( void * ) parms );
code = IMPORTER_CODE_NOT_WILLING_TO;
uri_parms.version = 1;
......
......@@ -164,11 +164,13 @@ instance_init( GTypeInstance *instance, gpointer klass )
static const gchar *thisfn = "na_io_provider_instance_init";
NAIOProvider *self;
g_debug( "%s: instance=%p (%s), klass=%p",
thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ), ( void * ) klass );
g_return_if_fail( NA_IS_IO_PROVIDER( instance ));
self = NA_IO_PROVIDER( instance );
g_debug( "%s: instance=%p (%s), klass=%p",
thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ), ( void * ) klass );
self->private = g_new0( NAIOProviderPrivate, 1 );
self->private->dispose_has_run = FALSE;
......@@ -184,12 +186,14 @@ instance_constructed( GObject *object )
static const gchar *thisfn = "na_io_provider_instance_constructed";
NAIOProvider *self;
g_debug( "%s: object=%p", thisfn, ( void * ) object );
g_return_if_fail( NA_IS_IO_PROVIDER( object ));
self = NA_IO_PROVIDER( object );
if( !self->private->dispose_has_run ){
g_debug( "%s: object=%p", thisfn, ( void * ) object );
/* chain up to the parent class */
if( G_OBJECT_CLASS( st_parent_class )->constructed ){
G_OBJECT_CLASS( st_parent_class )->constructed( object );
......@@ -244,12 +248,13 @@ instance_dispose( GObject *object )
static const gchar *thisfn = "na_io_provider_instance_dispose";
NAIOProvider *self;
g_debug( "%s: object=%p (%s)", thisfn, ( void * ) object, G_OBJECT_TYPE_NAME( object ));
g_return_if_fail( NA_IS_IO_PROVIDER( object ));
self = NA_IO_PROVIDER( object );
if( !self->private->dispose_has_run ){
g_debug( "%s: object=%p (%s)", thisfn, ( void * ) object, G_OBJECT_TYPE_NAME( object ));
self->private->dispose_has_run = TRUE;
if( self->private->provider ){
......@@ -274,10 +279,11 @@ instance_finalize( GObject *object )
static const gchar *thisfn = "na_io_provider_instance_finalize";
NAIOProvider *self;
g_debug( "%s: object=%p", thisfn, ( void * ) object );
g_return_if_fail( NA_IS_IO_PROVIDER( object ));
self = NA_IO_PROVIDER( object );
g_debug( "%s: object=%p", thisfn, ( void * ) object );
g_free( self->private->id );
g_free( self->private->name );
......
......@@ -142,11 +142,12 @@ na_ipivot_consumer_delay_notify( NAIPivotConsumer *instance )
static const gchar *thisfn = "na_ipivot_consumer_delay_notify";
GTimeVal *last_delay;
g_debug( "%s: instance=%p", thisfn, ( void * ) instance );
g_return_if_fail( NA_IS_IPIVOT_CONSUMER( instance ));
if( st_initialized && !st_finalized ){
g_debug( "%s: instance=%p", thisfn, ( void * ) instance );
last_delay = ( GTimeVal * ) g_object_get_data( G_OBJECT( instance ), "na-ipivot-consumer-delay-notify" );
if( !last_delay ){
......@@ -170,12 +171,12 @@ void na_ipivot_consumer_notify_of_items_changed( NAIPivotConsumer *instance )
{
static const gchar *thisfn = "na_ipivot_consumer_notify_of_items_changed";
g_debug( "%s: instance=%p", thisfn, ( void * ) instance );
g_return_if_fail( NA_IS_IPIVOT_CONSUMER( instance ));
if( st_initialized && !st_finalized ){
g_debug( "%s: instance=%p", thisfn, ( void * ) instance );
if( is_notify_allowed( instance )){
if( NA_IPIVOT_CONSUMER_GET_INTERFACE( instance )->on_items_changed ){
......@@ -195,12 +196,12 @@ void na_ipivot_consumer_notify_of_mandatory_prefs_changed( NAIPivotConsumer *ins
{
static const gchar *thisfn = "na_ipivot_consumer_notify_of_mandatory_prefs_changed";
g_debug( "%s: instance=%p", thisfn, ( void * ) instance );
g_return_if_fail( NA_IS_IPIVOT_CONSUMER( instance ));
if( st_initialized && !st_finalized ){
g_debug( "%s: instance=%p", thisfn, ( void * ) instance );
if( is_notify_allowed( instance )){
if( NA_IPIVOT_CONSUMER_GET_INTERFACE( instance )->on_mandatory_prefs_changed ){
......
......@@ -144,11 +144,12 @@ instance_init( GTypeInstance *instance, gpointer klass )
static const gchar *thisfn = "na_module_instance_init";
NAModule *self;
g_debug( "%s: instance=%p (%s), klass=%p",
thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ), ( void * ) klass );
g_return_if_fail( NA_IS_MODULE( instance ));
self = NA_MODULE( instance );
g_debug( "%s: instance=%p (%s), klass=%p",
thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ), ( void * ) klass );
self->private = g_new0( NAModulePrivate, 1 );
self->private->dispose_has_run = FALSE;
......@@ -160,12 +161,13 @@ instance_dispose( GObject *object )
static const gchar *thisfn = "na_module_instance_dispose";
NAModule *self;
g_debug( "%s: object=%p (%s)", thisfn, ( void * ) object, G_OBJECT_TYPE_NAME( object ));
g_return_if_fail( NA_IS_MODULE( object ));
self = NA_MODULE( object );
if( !self->private->dispose_has_run ){
g_debug( "%s: object=%p (%s)", thisfn, ( void * ) object, G_OBJECT_TYPE_NAME( object ));
self->private->dispose_has_run = TRUE;
if( G_OBJECT_CLASS( st_parent_class )->dispose ){
......@@ -180,10 +182,11 @@ instance_finalize( GObject *object )
static const gchar *thisfn = "na_module_instance_finalize";
NAModule *self;
g_debug( "%s: object=%p", thisfn, ( void * ) object );
g_return_if_fail( NA_IS_MODULE( object ));
self = NA_MODULE( object );
g_debug( "%s: object=%p", thisfn, ( void * ) object );
g_free( self->private->path );
g_free( self->private->name );
......@@ -303,9 +306,10 @@ module_load( GTypeModule *gmodule )
NAModule *module;
gboolean loaded;
g_debug( "%s: gmodule=%p", thisfn, ( void * ) gmodule );
g_return_val_if_fail( G_IS_TYPE_MODULE( gmodule ), FALSE );
g_debug( "%s: gmodule=%p", thisfn, ( void * ) gmodule );
loaded = FALSE;
module = NA_MODULE( gmodule );
......@@ -419,9 +423,10 @@ module_unload( GTypeModule *gmodule )
static const gchar *thisfn = "na_module_module_unload";
NAModule *module;
g_debug( "%s: gmodule=%p", thisfn, ( void * ) gmodule );
g_return_if_fail( G_IS_TYPE_MODULE( gmodule ));
g_debug( "%s: gmodule=%p", thisfn, ( void * ) gmodule );
module = NA_MODULE( gmodule );
if( module->private->shutdown ){
......
......@@ -183,13 +183,13 @@ instance_init( GTypeInstance *instance, gpointer klass )
static const gchar *thisfn = "na_object_action_instance_init";
NAObjectAction *self;
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_ACTION( instance ));
self = NA_OBJECT_ACTION( instance );
g_debug( "%s: instance=%p (%s), klass=%p",
thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ), ( void * ) klass );
self->private = g_new0( NAObjectActionPrivate, 1 );
}
......@@ -223,14 +223,14 @@ instance_dispose( GObject *object )
static const gchar *thisfn = "na_object_action_instance_dispose";
NAObjectAction *self;
g_debug( "%s: object=%p (%s)", thisfn, ( void * ) object, G_OBJECT_TYPE_NAME( object ));
g_return_if_fail( NA_IS_OBJECT_ACTION( object ));
self = NA_OBJECT_ACTION( object );
if( !self->private->dispose_has_run ){
g_debug( "%s: object=%p (%s)", thisfn, ( void * ) object, G_OBJECT_TYPE_NAME( object ));
self->private->dispose_has_run = TRUE;
/* chain up to the parent class */
......@@ -246,12 +246,12 @@ instance_finalize( GObject *object )
static const gchar *thisfn = "na_object_action_instance_finalize";
NAObjectAction *self;
g_debug( "%s: object=%p (%s)", thisfn, ( void * ) object, G_OBJECT_TYPE_NAME( object ));
g_return_if_fail( NA_IS_OBJECT_ACTION( object ));
self = NA_OBJECT_ACTION( object );
g_debug( "%s: object=%p (%s)", thisfn, ( void * ) object, G_OBJECT_TYPE_NAME( object ));
g_free( self->private );
/* chain call to parent class */
......
......@@ -128,13 +128,13 @@ instance_init( GTypeInstance *instance, gpointer klass )
static const gchar *thisfn = "na_object_id_instance_init";
NAObjectId *self;
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 );
g_debug( "%s: instance=%p (%s), klass=%p",
thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ), ( void * ) klass );
self->private = g_new0( NAObjectIdPrivate, 1 );
}
......@@ -151,14 +151,14 @@ instance_dispose( GObject *object )
NAObjectId *self;
NAObjectItem *parent;
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 ){
g_debug( "%s: object=%p (%s)", thisfn, ( void * ) object, G_OBJECT_TYPE_NAME( object ));
self->private->dispose_has_run = TRUE;
parent = na_object_get_parent( object );
......@@ -287,14 +287,14 @@ na_object_id_prepare_for_paste( NAObjectId *object, gboolean relabel, gboolean r
static const gchar *thisfn = "na_object_id_prepare_for_paste";
GList *subitems, *it;
g_debug( "%s: object=%p, relabel=%s, renumber=%s, parent=%p",
thisfn, ( void * ) object, relabel ? "True":"False", renumber ? "True":"False", ( void * ) parent );
g_return_if_fail( NA_IS_OBJECT_ID( object ));
g_return_if_fail( !parent || NA_IS_OBJECT_ITEM( parent ));
if( !object->private->dispose_has_run ){
g_debug( "%s: object=%p, relabel=%s, renumber=%s, parent=%p",
thisfn, ( void * ) object, relabel ? "True":"False", renumber ? "True":"False", ( void * ) parent );
if( NA_IS_OBJECT_PROFILE( object )){
na_object_set_parent( object, parent );
na_object_set_new_id( object, parent );
......
......@@ -147,13 +147,13 @@ instance_init( GTypeInstance *instance, gpointer klass )
static const gchar *thisfn = "na_object_item_instance_init";
NAObjectItem *self;
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_ITEM( instance ));
self = NA_OBJECT_ITEM( instance );
g_debug( "%s: instance=%p (%s), klass=%p",
thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ), ( void * ) klass );
self->private = g_new0( NAObjectItemPrivate, 1 );
}
......@@ -164,14 +164,14 @@ instance_dispose( GObject *object )
NAObjectItem *self;
GList *children;
g_debug( "%s: object=%p (%s)", thisfn, ( void * ) object, G_OBJECT_TYPE_NAME( object ));
g_return_if_fail( NA_IS_OBJECT_ITEM( object ));
self = NA_OBJECT_ITEM( object );
if( !self->private->dispose_has_run ){
g_debug( "%s: object=%p (%s)", thisfn, ( void * ) object, G_OBJECT_TYPE_NAME( object ));
self->private->dispose_has_run = TRUE;
children = na_object_get_items( self );
......
......@@ -176,13 +176,13 @@ instance_init( GTypeInstance *instance, gpointer klass )
static const gchar *thisfn = "na_object_menu_instance_init";
NAObjectMenu *self;
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_MENU( instance ));
self = NA_OBJECT_MENU( instance );
g_debug( "%s: instance=%p (%s), klass=%p",
thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ), ( void * ) klass );
self->private = g_new0( NAObjectMenuPrivate, 1 );
}
......@@ -216,14 +216,14 @@ instance_dispose( GObject *object )
static const gchar *thisfn = "na_object_menu_instance_dispose";
NAObjectMenu *self;
g_debug( "%s: object=%p (%s)", thisfn, ( void * ) object, G_OBJECT_TYPE_NAME( object ));
g_return_if_fail( NA_IS_OBJECT_MENU( object ));
self = NA_OBJECT_MENU( object );
if( !self->private->dispose_has_run ){
g_debug( "%s: object=%p (%s)", thisfn, ( void * ) object, G_OBJECT_TYPE_NAME( object ));
self->private->dispose_has_run = TRUE;
/* chain up to the parent class */
......@@ -239,12 +239,12 @@ instance_finalize( GObject *object )
static const gchar *thisfn = "na_object_menu_instance_finalize";
NAObjectMenu *self;
g_debug( "%s: object=%p (%s)", thisfn, ( void * ) object, G_OBJECT_TYPE_NAME( object ));
g_return_if_fail( NA_IS_OBJECT_MENU( object ));
self = NA_OBJECT_MENU( object );
g_debug( "%s: object=%p (%s)", thisfn, ( void * ) object, G_OBJECT_TYPE_NAME( object ));
g_free( self->private );
/* chain call to parent class */
......
......@@ -182,13 +182,13 @@ instance_init( GTypeInstance *instance, gpointer klass )
static const gchar *thisfn = "na_object_profile_instance_init";
NAObjectProfile *self;
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_PROFILE( instance ));
self = NA_OBJECT_PROFILE( instance );
g_debug( "%s: instance=%p (%s), klass=%p",
thisfn, ( void * ) instance, G_OBJECT_TYPE_NAME( instance ), ( void * ) klass );
self->private = g_new0( NAObjectProfilePrivate, 1 );
self->private->dispose_has_run = FALSE;
......@@ -224,14 +224,14 @@ instance_dispose( GObject *object )
static const gchar *thisfn = "na_object_profile_instance_dispose";
NAObjectProfile *self;
g_debug( "%s: object=%p (%s)", thisfn, ( void * ) object, G_OBJECT_TYPE_NAME( object ));
g_return_if_fail( NA_IS_OBJECT_PROFILE( object ));
self = NA_OBJECT_PROFILE( object );
if( !self->private->dispose_has_run ){
g_debug( "%s: object=%p (%s)", thisfn, ( void * ) object, G_OBJECT_TYPE_NAME( object ));
self->private->dispose_has_run = TRUE;
/* chain up to the parent class */
......@@ -247,12 +247,12 @@ instance_finalize( GObject *object )
static const gchar *thisfn = "na_object_profile_instance_finalize";
NAObjectProfile *self;
g_debug( "%s: object=%p (%s)", thisfn, ( void * ) object, G_OBJECT_TYPE_NAME( object ));
g_return_if_fail( NA_IS_OBJECT_PROFILE( object ));
self = NA_OBJECT_PROFILE( object );
g_debug( "%s: object=%p (%s)", thisfn, ( void * ) object, G_OBJECT_TYPE_NAME( object ));