GNOME.org
 

[nautilus-actions] Reverse the sens of deprecation test

commit 62f3fb85334929a599ee414ec5d68afe2258f501
Author: Pierre Wieser <pwieser trychlos org>
Date:   Mon Jan 2 07:04:46 2012 +0100

    Reverse the sens of deprecation test

 ChangeLog                          |   23 +++++++++++++++++++++++
 configure.ac                       |    2 +-
 docs/reference/Makefile.am         |    2 +-
 m4/na-maintainer-mode.m4           |    7 +++----
 src/api/na-core-utils.h            |    2 +-
 src/api/na-data-boxed.h            |    4 ++--
 src/api/na-gconf-monitor.h         |    4 ++--
 src/api/na-gconf-utils.h           |    4 ++--
 src/api/na-iduplicable.h           |    2 +-
 src/api/na-iexporter.h             |    2 +-
 src/api/na-object-api.h            |    2 +-
 src/api/na-object.h                |    2 +-
 src/core/na-core-utils.c           |    6 +++---
 src/core/na-data-boxed.c           |    8 ++++----
 src/core/na-exporter.c             |    2 +-
 src/core/na-gconf-monitor.c        |    4 ++--
 src/core/na-gconf-utils.c          |   12 ++++++------
 src/core/na-iduplicable.c          |    4 ++--
 src/core/na-object.c               |    4 ++--
 src/io-gconf/nagp-gconf-provider.c |   16 ++++++++--------
 src/io-gconf/nagp-writer.c         |   10 +++++-----
 src/io-gconf/nagp-writer.h         |    4 ++--
 22 files changed, 74 insertions(+), 52 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 00b8c2f..fbc2d33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,28 @@
 2012-01-02 Pierre Wieser <pwieser trychlos org>
 
+	* m4/na-maintainer-mode.m4: Reverse the sens of deprecation test.
+
+	* configure.ac:
+	* docs/reference/Makefile.am:
+	* src/api/na-core-utils.h:
+	* src/api/na-data-boxed.h:
+	* src/api/na-gconf-monitor.h:
+	* src/api/na-gconf-utils.h:
+	* src/api/na-iduplicable.h:
+	* src/api/na-iexporter.h:
+	* src/api/na-object-api.h:
+	* src/api/na-object.h:
+	* src/core/na-core-utils.c:
+	* src/core/na-data-boxed.c:
+	* src/core/na-exporter.c:
+	* src/core/na-gconf-monitor.c:
+	* src/core/na-gconf-utils.c:
+	* src/core/na-iduplicable.c:
+	* src/core/na-object.c:
+	* src/io-gconf/nagp-gconf-provider.c:
+	* src/io-gconf/nagp-writer.c:
+	* src/io-gconf/nagp-writer.h: Updated accordingly.
+
 	* src/core/na-importer.c (na_importer_import_from_list): Fix typo.
 
 	* src/core/na-about.c:
diff --git a/configure.ac b/configure.ac
index d0ae861..c684f74 100644
--- a/configure.ac
+++ b/configure.ac
@@ -111,7 +111,7 @@ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["${GETTEXT_PACKAGE}"],[gettext package])
 AM_GLIB_GNU_GETTEXT
 
 # Enable deprecated functions ?
-NA_ENABLE_DEPRECATED
+NA_CHECK_FOR_DEPRECATED
 
 # Have and want GConf support ?
 NA_CHECK_FOR_GCONF
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index b0c72d7..c7745c2 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -71,7 +71,7 @@ endif
 #	--rebuild-sections
 SCAN_OPTIONS = \
 	--rebuild-types								\
-	--deprecated-guards=NA_DISABLE_DEPRECATED	\
+	--deprecated-guards=NA_ENABLE_DEPRECATED	\
 	$(NULL)
 
 # The directory containing the source code. Relative to $(srcdir)
diff --git a/m4/na-maintainer-mode.m4 b/m4/na-maintainer-mode.m4
index b066f04..5fee45e 100644
--- a/m4/na-maintainer-mode.m4
+++ b/m4/na-maintainer-mode.m4
@@ -45,7 +45,7 @@ AC_DEFUN([NA_IS_MAINTAINER_MODE],[
 	AM_CONDITIONAL([NA_MAINTAINER_MODE], [test "${USE_MAINTAINER_MODE}" = "yes"])
 ])
 
-AC_DEFUN([NA_ENABLE_DEPRECATED],[
+AC_DEFUN([NA_CHECK_FOR_DEPRECATED],[
 	AC_ARG_ENABLE(
 		[deprecated],
 		AC_HELP_STRING(
@@ -59,9 +59,8 @@ AC_DEFUN([NA_ENABLE_DEPRECATED],[
 	AC_MSG_CHECKING([whether deprecated symbols should be enabled])
 	AC_MSG_RESULT([${enable_deprecated}])
 
-	if test "${enable_deprecated}" = "no"; then
-		AC_DEFINE([NA_DISABLE_DEPRECATED],[1],[Define to 1 if deprecated functions should be disabled])
-		AC_SUBST([AM_CPPFLAGS],["${AM_CPPFLAGS} ${NA_DISABLE_DEPRECATED}"])
+	if test "${enable_deprecated}" = "yes"; then
+		AC_DEFINE([NA_ENABLE_DEPRECATED],[1],[Define to 1 if deprecated functions should be enabled])
 	fi
 
 	AM_CONDITIONAL([ENABLE_DEPRECATED], [test "${enable_deprecated}" = "yes"])
diff --git a/src/api/na-core-utils.h b/src/api/na-core-utils.h
index 0c86c80..1891ab7 100644
--- a/src/api/na-core-utils.h
+++ b/src/api/na-core-utils.h
@@ -48,7 +48,7 @@ gboolean na_core_utils_boolean_from_string( const gchar *string );
 
 /* string manipulation
  */
-#ifndef NA_DISABLE_DEPRECATED
+#ifdef NA_ENABLE_DEPRECATED
 gchar   *na_core_utils_str_add_prefix( const gchar *prefix, const gchar *str );
 #endif
 int      na_core_utils_str_collate( const gchar *str1, const gchar *str2 );
diff --git a/src/api/na-data-boxed.h b/src/api/na-data-boxed.h
index 049304a..11f3f14 100644
--- a/src/api/na-data-boxed.h
+++ b/src/api/na-data-boxed.h
@@ -96,7 +96,7 @@ gboolean         na_data_boxed_is_valid       ( const NADataBoxed *boxed );
 
 /* These functions are deprecated starting with 3.1.0
  */
-#ifndef NA_DISABLE_DEPRECATED
+#ifdef NA_ENABLE_DEPRECATED
 gboolean         na_data_boxed_are_equal      ( const NADataBoxed *a, const NADataBoxed *b );
 void             na_data_boxed_dump           ( const NADataBoxed *boxed );
 gchar           *na_data_boxed_get_as_string  ( const NADataBoxed *boxed );
@@ -106,7 +106,7 @@ void             na_data_boxed_set_from_boxed ( NADataBoxed *boxed, const NAData
 void             na_data_boxed_set_from_string( NADataBoxed *boxed, const gchar *value );
 void             na_data_boxed_set_from_value ( NADataBoxed *boxed, const GValue *value );
 void             na_data_boxed_set_from_void  ( NADataBoxed *boxed, const void *value );
-#endif /* NA_DISABLE_DEPRECATED */
+#endif /* NA_ENABLE_DEPRECATED */
 
 G_END_DECLS
 
diff --git a/src/api/na-gconf-monitor.h b/src/api/na-gconf-monitor.h
index fdb4161..f57ac3d 100644
--- a/src/api/na-gconf-monitor.h
+++ b/src/api/na-gconf-monitor.h
@@ -32,7 +32,7 @@
 #define __NAUTILUS_ACTIONS_API_NA_GCONF_MONITOR_H__
 
 #ifdef HAVE_GCONF
-#ifndef NA_DISABLE_DEPRECATED
+#ifdef NA_ENABLE_DEPRECATED
 /**
  * SECTION: gconf-monitor
  * @title: NAGConfMonitor
@@ -84,6 +84,6 @@ void            na_gconf_monitor_release_monitors( GList *monitors );
 
 G_END_DECLS
 
-#endif /* NA_DISABLE_DEPRECATED */
+#endif /* NA_ENABLE_DEPRECATED */
 #endif /* HAVE_GCONF */
 #endif /* __NAUTILUS_ACTIONS_API_NA_GCONF_MONITOR_H__ */
diff --git a/src/api/na-gconf-utils.h b/src/api/na-gconf-utils.h
index b619d3b..ec9bab8 100644
--- a/src/api/na-gconf-utils.h
+++ b/src/api/na-gconf-utils.h
@@ -64,7 +64,7 @@ GSList  *na_gconf_utils_read_string_list ( GConfClient *gconf, const gchar *path
 
 /* Writing in GConf is deprecated since 3.1.0
  */
-#ifndef NA_DISABLE_DEPRECATED
+#ifdef NA_ENABLE_DEPRECATED
 gboolean na_gconf_utils_write_bool       ( GConfClient *gconf, const gchar *path, gboolean value, gchar **message );
 gboolean na_gconf_utils_write_int        ( GConfClient *gconf, const gchar *path, gint value, gchar **message );
 gboolean na_gconf_utils_write_string     ( GConfClient *gconf, const gchar *path, const gchar *value, gchar **message );
@@ -72,7 +72,7 @@ gboolean na_gconf_utils_write_string_list( GConfClient *gconf, const gchar *path
 gboolean na_gconf_utils_remove_entry     ( GConfClient *gconf, const gchar *path, gchar **message );
 GSList  *na_gconf_utils_slist_from_string( const gchar *value );
 gchar   *na_gconf_utils_slist_to_string  ( GSList *slist );
-#endif /* NA_DISABLE_DEPRECATED */
+#endif /* NA_ENABLE_DEPRECATED */
 
 G_END_DECLS
 
diff --git a/src/api/na-iduplicable.h b/src/api/na-iduplicable.h
index f1a18bf..7d6009f 100644
--- a/src/api/na-iduplicable.h
+++ b/src/api/na-iduplicable.h
@@ -205,7 +205,7 @@ void           na_iduplicable_set_origin  ( NAIDuplicable *object, const NAIDupl
 
 void           na_iduplicable_register_consumer( GObject *consumer );
 
-#ifndef NA_DISABLE_DEPRECATED
+#ifdef NA_ENABLE_DEPRECATED
 void           na_iduplicable_set_modified( NAIDuplicable *object, gboolean modified );
 #endif
 
diff --git a/src/api/na-iexporter.h b/src/api/na-iexporter.h
index ea44601..5b27b41 100644
--- a/src/api/na-iexporter.h
+++ b/src/api/na-iexporter.h
@@ -86,7 +86,7 @@ typedef struct _NAIExporterInterfacePrivate    NAIExporterInterfacePrivate;
 typedef struct _NAIExporterFileParms           NAIExporterFileParms;
 typedef struct _NAIExporterBufferParms         NAIExporterBufferParms;
 
-#ifndef NA_DISABLE_DEPRECATED
+#ifdef NA_ENABLE_DEPRECATED
 /**
  * NAIExporterFormat:
  * @format:      format identifier (ascii).
diff --git a/src/api/na-object-api.h b/src/api/na-object-api.h
index 6e38fda..56f5147 100644
--- a/src/api/na-object-api.h
+++ b/src/api/na-object-api.h
@@ -213,7 +213,7 @@ G_BEGIN_DECLS
 #define na_object_set_selection_count( obj, cond )      na_ifactory_object_set_from_void( NA_IFACTORY_OBJECT( obj ), NAFO_DATA_SELECTION_COUNT, ( const void * )( cond ))
 #define na_object_set_capabilities( obj, cap )          na_ifactory_object_set_from_void( NA_IFACTORY_OBJECT( obj ), NAFO_DATA_CAPABILITITES, ( const void * )( cap ))
 
-#ifndef NA_DISABLE_DEPRECATED
+#ifdef NA_ENABLE_DEPRECATED
 #define na_object_set_modified( obj, modified )         na_iduplicable_set_modified( NA_IDUPLICABLE( obj ), ( modified ))
 #endif
 
diff --git a/src/api/na-object.h b/src/api/na-object.h
index 7a05904..946f9d3 100644
--- a/src/api/na-object.h
+++ b/src/api/na-object.h
@@ -165,7 +165,7 @@ void      na_object_object_dump      ( const NAObject *object );
 void      na_object_object_dump_norec( const NAObject *object );
 void      na_object_object_dump_tree ( GList *tree );
 
-#ifndef NA_DISABLE_DEPRECATED
+#ifdef NA_ENABLE_DEPRECATED
 GList    *na_object_get_hierarchy( const NAObject *object );
 void      na_object_free_hierarchy( GList *hierarchy );
 #endif
diff --git a/src/core/na-core-utils.c b/src/core/na-core-utils.c
index 028b95b..25d6f8c 100644
--- a/src/core/na-core-utils.c
+++ b/src/core/na-core-utils.c
@@ -49,7 +49,7 @@
 #define SIZE_MIN		  1
 #define SIZE_MAX	1048576		/* 1 MB */
 
-#ifndef NA_DISABLE_DEPRECATED
+#ifdef NA_ENABLE_DEPRECATED
 static GSList  *text_to_string_list( const gchar *text, const gchar *separator, const gchar *default_value );
 #endif
 static gboolean info_dir_is_writable( GFile *file, const gchar *path );
@@ -72,7 +72,7 @@ na_core_utils_boolean_from_string( const gchar *string )
 	return( g_ascii_strcasecmp( string, "true" ) == 0 || atoi( string ) != 0 );
 }
 
-#ifndef NA_DISABLE_DEPRECATED
+#ifdef NA_ENABLE_DEPRECATED
 /**
  * na_core_utils_str_add_prefix:
  * @prefix: the prefix to be prepended.
@@ -127,7 +127,7 @@ text_to_string_list( const gchar *text, const gchar *separator, const gchar *def
 	g_free( source );
 	return( strlist );
 }
-#endif
+#endif /* NA_ENABLE_DEPRECATED */
 
 /**
  * na_core_utils_str_collate:
diff --git a/src/core/na-data-boxed.c b/src/core/na-data-boxed.c
index 5297321..9bdcff9 100644
--- a/src/core/na-data-boxed.c
+++ b/src/core/na-data-boxed.c
@@ -378,7 +378,7 @@ na_data_boxed_get_param_spec( const NADataDef *def )
 	return( spec );
 }
 
-#ifndef NA_DISABLE_DEPRECATED
+#ifdef NA_ENABLE_DEPRECATED
 /**
  * na_data_boxed_are_equal:
  * @a: the first #NADataBoxed object.
@@ -397,7 +397,7 @@ na_data_boxed_are_equal( const NADataBoxed *a, const NADataBoxed *b )
 
 	return( na_boxed_are_equal( NA_BOXED( a ), NA_BOXED( b )));
 }
-#endif /* NA_DISABLE_DEPRECATED */
+#endif /* NA_ENABLE_DEPRECATED */
 
 /**
  * na_data_boxed_is_default:
@@ -454,7 +454,7 @@ na_data_boxed_is_valid( const NADataBoxed *boxed )
 	return( is_valid );
 }
 
-#ifndef NA_DISABLE_DEPRECATED
+#ifdef NA_ENABLE_DEPRECATED
 /**
  * na_data_boxed_dump:
  * @boxed: this #NADataBoxed object.
@@ -584,7 +584,7 @@ na_data_boxed_set_from_void( NADataBoxed *boxed, const void *value )
 {
 	na_boxed_set_from_void( NA_BOXED( boxed ), value );
 }
-#endif /* NA_DISABLE_DEPRECATED */
+#endif /* NA_ENABLE_DEPRECATED */
 
 static GParamSpec *
 bool_spec( const NADataDef *def )
diff --git a/src/core/na-exporter.c b/src/core/na-exporter.c
index c8ed513..58a2429 100644
--- a/src/core/na-exporter.c
+++ b/src/core/na-exporter.c
@@ -271,7 +271,7 @@ exporter_get_formats( const NAIExporter *exporter )
 
 	if( NA_IEXPORTER_GET_INTERFACE( exporter )->get_formats ){
 		if( version == 1 ){
-#ifndef NA_DISABLE_DEPRECATED
+#ifdef NA_ENABLE_DEPRECATED
 			const NAIExporterFormat * strv1;
 			strv1 = NA_IEXPORTER_GET_INTERFACE( exporter )->get_formats( exporter );
 			while( strv1->format ){
diff --git a/src/core/na-gconf-monitor.c b/src/core/na-gconf-monitor.c
index 0c0d4ce..9d64c3d 100644
--- a/src/core/na-gconf-monitor.c
+++ b/src/core/na-gconf-monitor.c
@@ -35,7 +35,7 @@
 #include <api/na-gconf-monitor.h>
 
 #ifdef HAVE_GCONF
-#ifndef NA_DISABLE_DEPRECATED
+#ifdef NA_ENABLE_DEPRECATED
 
 /* private class data
  */
@@ -308,5 +308,5 @@ release_monitor( NAGConfMonitor *monitor )
 	}
 }
 
-#endif /* NA_DISABLE_DEPRECATED */
+#endif /* NA_ENABLE_DEPRECATED */
 #endif /* HAVE_GCONF */
diff --git a/src/core/na-gconf-utils.c b/src/core/na-gconf-utils.c
index e6a4eff..4663812 100644
--- a/src/core/na-gconf-utils.c
+++ b/src/core/na-gconf-utils.c
@@ -42,9 +42,9 @@
 static void        dump_entry( GConfEntry *entry, void *user_data );
 static GConfValue *read_value( GConfClient *gconf, const gchar *path, gboolean use_schema, GConfValueType type );
 
-#ifndef NA_DISABLE_DEPRECATED
+#ifdef NA_ENABLE_DEPRECATED
 static gboolean    sync_gconf( GConfClient *gconf, gchar **message );
-#endif /* NA_DISABLE_DEPRECATED */
+#endif /* NA_ENABLE_DEPRECATED */
 
 /**
  * na_gconf_utils_get_subdirs:
@@ -527,7 +527,7 @@ na_gconf_utils_read_string_list( GConfClient *gconf, const gchar *path )
 	return( list_strings );
 }
 
-#ifndef NA_DISABLE_DEPRECATED
+#ifdef NA_ENABLE_DEPRECATED
 /**
  * na_gconf_utils_write_bool:
  * @gconf: a GConfClient instance.
@@ -793,7 +793,7 @@ na_gconf_utils_slist_to_string( GSList *slist )
 
 	return( g_string_free( str, FALSE ));
 }
-#endif /* NA_DISABLE_DEPRECATED */
+#endif /* NA_ENABLE_DEPRECATED */
 
 static GConfValue *
 read_value( GConfClient *gconf, const gchar *path, gboolean use_schema, GConfValueType type )
@@ -828,7 +828,7 @@ read_value( GConfClient *gconf, const gchar *path, gboolean use_schema, GConfVal
 	return( value );
 }
 
-#ifndef NA_DISABLE_DEPRECATED
+#ifdef NA_ENABLE_DEPRECATED
 static gboolean
 sync_gconf( GConfClient *gconf, gchar **message )
 {
@@ -848,6 +848,6 @@ sync_gconf( GConfClient *gconf, gchar **message )
 
 	return( ret );
 }
-#endif /* NA_DISABLE_DEPRECATED */
+#endif /* NA_ENABLE_DEPRECATED */
 
 #endif /* HAVE_GCONF */
diff --git a/src/core/na-iduplicable.c b/src/core/na-iduplicable.c
index 966d8c1..c82a9c3 100644
--- a/src/core/na-iduplicable.c
+++ b/src/core/na-iduplicable.c
@@ -511,7 +511,7 @@ na_iduplicable_set_origin( NAIDuplicable *object, const NAIDuplicable *origin )
 	}
 }
 
-#ifndef NA_DISABLE_DEPRECATED
+#ifdef NA_ENABLE_DEPRECATED
 /**
  * na_iduplicable_set_modified:
  * @object: the #NAIDuplicable object whose modification status is to be set.
@@ -535,7 +535,7 @@ na_iduplicable_set_modified( NAIDuplicable *object, gboolean modified )
 		str->modified = modified;
 	}
 }
-#endif /* NA_DISABLE_DEPRECATED */
+#endif /* NA_ENABLE_DEPRECATED */
 
 static void
 v_copy( NAIDuplicable *target, const NAIDuplicable *source )
diff --git a/src/core/na-object.c b/src/core/na-object.c
index 65a30e4..f2f8d5e 100644
--- a/src/core/na-object.c
+++ b/src/core/na-object.c
@@ -664,7 +664,7 @@ na_object_object_unref( NAObject *object )
 	}
 }
 
-#ifndef NA_DISABLE_DEPRECATED
+#ifdef NA_ENABLE_DEPRECATED
 /*
  * build the class hierarchy
  * returns a list of GObjectClass, which starts with NAObject,
@@ -732,7 +732,7 @@ na_object_free_hierarchy( GList *hierarchy )
 {
 	g_list_free( hierarchy );
 }
-#endif /* NA_DISABLE_DEPRECATED */
+#endif /* NA_ENABLE_DEPRECATED */
 
 /**
  * na_object_object_debug_invalid:
diff --git a/src/io-gconf/nagp-gconf-provider.c b/src/io-gconf/nagp-gconf-provider.c
index 154cac6..8d2b2eb 100644
--- a/src/io-gconf/nagp-gconf-provider.c
+++ b/src/io-gconf/nagp-gconf-provider.c
@@ -53,7 +53,7 @@ struct _NagpGConfProviderClassPrivate {
 static GType         st_module_type = 0;
 static GObjectClass *st_parent_class = NULL;
 
-#ifndef NA_DISABLE_DEPRECATED
+#ifdef NA_ENABLE_DEPRECATED
 static gint          st_burst_timeout = 100;		/* burst timeout in msec */
 #endif
 
@@ -70,7 +70,7 @@ static guint    iio_provider_get_version( const NAIIOProvider *provider );
 static void     ifactory_provider_iface_init( NAIFactoryProviderInterface *iface );
 static guint    ifactory_provider_get_version( const NAIFactoryProvider *provider );
 
-#ifndef NA_DISABLE_DEPRECATED
+#ifdef NA_ENABLE_DEPRECATED
 static GList   *install_monitors( NagpGConfProvider *provider );
 static void     config_path_changed_cb( GConfClient *client, guint cnxn_id, GConfEntry *entry, NagpGConfProvider *provider );
 static gboolean config_path_changed_trigger_interface( NagpGConfProvider *provider );
@@ -157,7 +157,7 @@ instance_init( GTypeInstance *instance, gpointer klass )
 
 	self->private->gconf = gconf_client_get_default();
 
-#ifndef NA_DISABLE_DEPRECATED
+#ifdef NA_ENABLE_DEPRECATED
 	self->private->monitors = install_monitors( self );
 #endif
 }
@@ -178,7 +178,7 @@ instance_dispose( GObject *object )
 
 		self->private->dispose_has_run = TRUE;
 
-#ifndef NA_DISABLE_DEPRECATED
+#ifdef NA_ENABLE_DEPRECATED
 		/* release the GConf monitoring */
 		na_gconf_monitor_release_monitors( self->private->monitors );
 #endif
@@ -226,7 +226,7 @@ iio_provider_iface_init( NAIIOProviderInterface *iface )
 	iface->read_items = nagp_iio_provider_read_items;
 	iface->is_willing_to_write = nagp_iio_provider_is_willing_to_write;
 	iface->is_able_to_write = nagp_iio_provider_is_able_to_write;
-#ifndef NA_DISABLE_DEPRECATED
+#ifdef NA_ENABLE_DEPRECATED
 	iface->write_item = nagp_iio_provider_write_item;
 	iface->delete_item = nagp_iio_provider_delete_item;
 #else
@@ -265,7 +265,7 @@ ifactory_provider_iface_init( NAIFactoryProviderInterface *iface )
 	iface->read_start = nagp_reader_read_start;
 	iface->read_data = nagp_reader_read_data;
 	iface->read_done = nagp_reader_read_done;
-#ifndef NA_DISABLE_DEPRECATED
+#ifdef NA_ENABLE_DEPRECATED
 	iface->write_start = nagp_writer_write_start;
 	iface->write_data = nagp_writer_write_data;
 	iface->write_done = nagp_writer_write_done;
@@ -282,7 +282,7 @@ ifactory_provider_get_version( const NAIFactoryProvider *provider )
 	return( 1 );
 }
 
-#ifndef NA_DISABLE_DEPRECATED
+#ifdef NA_ENABLE_DEPRECATED
 static GList *
 install_monitors( NagpGConfProvider *provider )
 {
@@ -412,4 +412,4 @@ time_val_diff( const GTimeVal *recent, const GTimeVal *old )
 	microsec += recent->tv_usec  - old->tv_usec;
 	return( microsec );
 }
-#endif /* NA_DISABLE_DEPRECATED */
+#endif /* NA_ENABLE_DEPRECATED */
diff --git a/src/io-gconf/nagp-writer.c b/src/io-gconf/nagp-writer.c
index d86ca11..215b366 100644
--- a/src/io-gconf/nagp-writer.c
+++ b/src/io-gconf/nagp-writer.c
@@ -46,7 +46,7 @@
 #include "nagp-writer.h"
 #include "nagp-keys.h"
 
-#ifndef NA_DISABLE_DEPRECATED
+#ifdef NA_ENABLE_DEPRECATED
 static void write_start_write_type( NagpGConfProvider *provider, NAObjectItem *item );
 static void write_start_write_version( NagpGConfProvider *provider, NAObjectItem *item );
 #endif
@@ -57,7 +57,7 @@ static void write_start_write_version( NagpGConfProvider *provider, NAObjectItem
 gboolean
 nagp_iio_provider_is_willing_to_write( const NAIIOProvider *provider )
 {
-#ifndef NA_DISABLE_DEPRECATED
+#ifdef NA_ENABLE_DEPRECATED
 	return( TRUE );
 #else
 	return( FALSE );
@@ -78,7 +78,7 @@ nagp_iio_provider_is_willing_to_write( const NAIIOProvider *provider )
 gboolean
 nagp_iio_provider_is_able_to_write( const NAIIOProvider *provider )
 {
-#ifndef NA_DISABLE_DEPRECATED
+#ifdef NA_ENABLE_DEPRECATED
 	static const gchar *thisfn = "nagp_iio_provider_is_able_to_write";
 	static const gchar *path = "/apps/nautilus-actions/foo";
 	NagpGConfProvider *self;
@@ -120,7 +120,7 @@ nagp_iio_provider_is_able_to_write( const NAIIOProvider *provider )
 #endif
 }
 
-#ifndef NA_DISABLE_DEPRECATED
+#ifdef NA_ENABLE_DEPRECATED
 /*
  * update an existing item or write a new one
  * in all cases, it is much more easy to delete the existing  entries
@@ -394,4 +394,4 @@ nagp_writer_write_done( const NAIFactoryProvider *writer, void *writer_data,
 {
 	return( NA_IIO_PROVIDER_CODE_OK );
 }
-#endif /* NA_DISABLE_DEPRECATED */
+#endif /* NA_ENABLE_DEPRECATED */
diff --git a/src/io-gconf/nagp-writer.h b/src/io-gconf/nagp-writer.h
index 083feb6..9ec40af 100644
--- a/src/io-gconf/nagp-writer.h
+++ b/src/io-gconf/nagp-writer.h
@@ -45,7 +45,7 @@ gboolean nagp_iio_provider_is_able_to_write   ( const NAIIOProvider *provider );
 
 /* Writing into GConf is deprecated since 3.1.0
  */
-#ifndef NA_DISABLE_DEPRECATED
+#ifdef NA_ENABLE_DEPRECATED
 guint    nagp_iio_provider_write_item         ( const NAIIOProvider *provider,
 													const NAObjectItem *item, GSList **message );
 
@@ -65,7 +65,7 @@ guint    nagp_writer_write_data ( const NAIFactoryProvider *provider, void *writ
 guint    nagp_writer_write_done ( const NAIFactoryProvider *writer, void *writer_data,
 									const NAIFactoryObject *object,
 									GSList **messages  );
-#endif /* NA_DISABLE_DEPRECATED */
+#endif /* NA_ENABLE_DEPRECATED */
 
 G_END_DECLS
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]