[file-roller] Remove G_CONST_RETURN from file-roller



commit 3cef28c06f01bb04b6b496b796f3e19f7ba27e7c
Author: Ryan Lortie <desrt desrt ca>
Date:   Thu Jun 9 11:50:27 2011 -0400

    Remove G_CONST_RETURN from file-roller
    
    file-roller contained a single use of G_CONST_RETURN which is being
    deprecated (bug #644611).
    
    https://bugzilla.gnome.org/show_bug.cgi?id=652207

 src/file-utils.c |    2 +-
 src/file-utils.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/file-utils.c b/src/file-utils.c
index fe0e55d..b31e752 100644
--- a/src/file-utils.c
+++ b/src/file-utils.c
@@ -435,7 +435,7 @@ file_is_hidden (const gchar *name)
 
 /* like g_path_get_basename but does not warn about NULL and does not
  * alloc a new string. */
-G_CONST_RETURN gchar *
+const gchar *
 file_name_from_path (const gchar *file_name)
 {
 	register char   *base;
diff --git a/src/file-utils.h b/src/file-utils.h
index aa86f0a..d51a325 100644
--- a/src/file-utils.h
+++ b/src/file-utils.h
@@ -61,7 +61,7 @@ gboolean            make_directory_tree_from_path (const char  *path,
 		   	                           mode_t       mode,
 		   	                           GError     **error);
 gboolean            file_is_hidden               (const char  *name);
-G_CONST_RETURN char*file_name_from_path          (const char  *path);
+const char *        file_name_from_path          (const char  *path);
 char *              dir_name_from_path           (const char  *path);
 char *              remove_level_from_path       (const char  *path);
 char *              remove_ending_separator      (const char  *path);



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