[nautilus-actions] na_core_utils_str_add_prefix(): fix function deprecation



commit c803bb902d5fd3a74db52bf7df3129eb8d2f461c
Author: Pierre Wieser <pwieser trychlos org>
Date:   Mon Jan 2 05:15:11 2012 +0100

    na_core_utils_str_add_prefix(): fix function deprecation

 ChangeLog                |    6 ++++++
 src/api/na-core-utils.h  |    2 +-
 src/core/na-core-utils.c |    4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index a828e84..f7adcb5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-01-02 Pierre Wieser <pwieser trychlos org>
+
+	* src/api/na-core-utils.h:
+	* src/core/na-core-utils.c (na_core_utils_str_add_prefix):
+	Fix function deprecation.
+
 2012-01-01 Pierre Wieser <pwieser trychlos org>
 
 	* src/nact/export-format-ask.png: Add omitted image.
diff --git a/src/api/na-core-utils.h b/src/api/na-core-utils.h
index 5155b04..05f1297 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
  */
-#ifdef NA_ENABLE_DEPRECATED
+#ifndef NA_DISABLE_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/core/na-core-utils.c b/src/core/na-core-utils.c
index b40582a..17bd521 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 */
 
-#ifdef NA_ENABLE_DEPRECATED
+#ifndef NA_DISABLE_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 );
 }
 
-#ifdef NA_ENABLE_DEPRECATED
+#ifndef NA_DISABLE_DEPRECATED
 /**
  * na_core_utils_str_add_prefix:
  * @prefix: the prefix to be prepended.



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]