[giggle] Use 'const' instead deprecated G_CONST_RETURN



commit 44b583a4f1aba5d29eebd1c5b943a25ce5b591da
Author: Javier Jardón <jjardon gnome org>
Date:   Mon Jun 13 23:49:08 2011 +0100

    Use 'const' instead deprecated G_CONST_RETURN

 libgiggle-git/giggle-git-config.c |    2 +-
 libgiggle-git/giggle-git-config.h |    2 +-
 libgiggle-git/giggle-git-log.c    |    2 +-
 libgiggle-git/giggle-git-log.h    |    2 +-
 libgiggle/giggle-ref.c            |    4 ++--
 libgiggle/giggle-ref.h            |    4 ++--
 src/giggle-avatar-image.c         |    4 ++--
 src/giggle-avatar-image.h         |    4 ++--
 src/giggle-input-dialog.c         |    2 +-
 src/giggle-input-dialog.h         |    2 +-
 10 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/libgiggle-git/giggle-git-config.c b/libgiggle-git/giggle-git-config.c
index acd82d8..1f84d36 100644
--- a/libgiggle-git/giggle-git-config.c
+++ b/libgiggle-git/giggle-git-config.c
@@ -541,7 +541,7 @@ giggle_git_config_update (GiggleGitConfig     *config,
 				 git_config_read_cb, task, g_free);
 }
 
-G_CONST_RETURN gchar *
+const gchar *
 giggle_git_config_get_field (GiggleGitConfig      *config,
 			     GiggleGitConfigField  field)
 {
diff --git a/libgiggle-git/giggle-git-config.h b/libgiggle-git/giggle-git-config.h
index 5c0463a..54ecf0a 100644
--- a/libgiggle-git/giggle-git-config.h
+++ b/libgiggle-git/giggle-git-config.h
@@ -72,7 +72,7 @@ void                    giggle_git_config_commit            (GiggleGitConfig
 							     GiggleGitConfigFunc   func,
 							     gpointer              data);
 
-G_CONST_RETURN gchar *  giggle_git_config_get_field         (GiggleGitConfig      *config,
+const gchar *           giggle_git_config_get_field         (GiggleGitConfig      *config,
 							     GiggleGitConfigField  field);
 int                     giggle_git_config_get_int_field     (GiggleGitConfig      *config,
 							     GiggleGitConfigField  field);
diff --git a/libgiggle-git/giggle-git-log.c b/libgiggle-git/giggle-git-log.c
index 44d272c..041253b 100644
--- a/libgiggle-git/giggle-git-log.c
+++ b/libgiggle-git/giggle-git-log.c
@@ -236,7 +236,7 @@ giggle_git_log_new (GiggleRevision *revision)
 			     NULL);
 }
 
-G_CONST_RETURN gchar *
+const gchar *
 giggle_git_log_get_log (GiggleGitLog *log)
 {
 	GiggleGitLogPriv *priv;
diff --git a/libgiggle-git/giggle-git-log.h b/libgiggle-git/giggle-git-log.h
index 69535f7..5cd25a3 100644
--- a/libgiggle-git/giggle-git-log.h
+++ b/libgiggle-git/giggle-git-log.h
@@ -47,7 +47,7 @@ struct GiggleGitLogClass {
 GType	               giggle_git_log_get_type      (void);
 GiggleJob *            giggle_git_log_new           (GiggleRevision *revision);
 
-G_CONST_RETURN gchar * giggle_git_log_get_log       (GiggleGitLog   *log);
+const gchar *          giggle_git_log_get_log       (GiggleGitLog   *log);
 
 
 G_END_DECLS
diff --git a/libgiggle/giggle-ref.c b/libgiggle/giggle-ref.c
index a97ac35..4f9087d 100644
--- a/libgiggle/giggle-ref.c
+++ b/libgiggle/giggle-ref.c
@@ -176,7 +176,7 @@ giggle_ref_new (const gchar *name)
 			     NULL);
 }
 
-G_CONST_RETURN gchar *
+const gchar *
 giggle_ref_get_name (GiggleRef *ref)
 {
 	if (G_LIKELY (ref))
@@ -185,7 +185,7 @@ giggle_ref_get_name (GiggleRef *ref)
 	return NULL;
 }
 
-G_CONST_RETURN gchar *
+const gchar *
 giggle_ref_get_sha (GiggleRef *ref)
 {
 	if (G_LIKELY (ref))
diff --git a/libgiggle/giggle-ref.h b/libgiggle/giggle-ref.h
index 02b0562..ab5911f 100644
--- a/libgiggle/giggle-ref.h
+++ b/libgiggle/giggle-ref.h
@@ -49,8 +49,8 @@ struct _GiggleRefClass {
 GType                   giggle_ref_get_type          (void) G_GNUC_CONST;
 GiggleRef             * giggle_ref_new               (const gchar *name);
 
-G_CONST_RETURN gchar  * giggle_ref_get_name          (GiggleRef   *ref);
-G_CONST_RETURN gchar  * giggle_ref_get_sha           (GiggleRef   *ref);
+const gchar *           giggle_ref_get_name          (GiggleRef   *ref);
+const gchar *           giggle_ref_get_sha           (GiggleRef   *ref);
 
 
 G_END_DECLS
diff --git a/src/giggle-avatar-image.c b/src/giggle-avatar-image.c
index 65f96c4..57ff554 100644
--- a/src/giggle-avatar-image.c
+++ b/src/giggle-avatar-image.c
@@ -537,7 +537,7 @@ giggle_avatar_image_set_image_uri (GiggleAvatarImage *image,
 	g_object_set (image, "image-uri", uri, NULL);
 }
 
-G_CONST_RETURN char *
+const char *
 giggle_avatar_image_get_image_uri (GiggleAvatarImage *image)
 {
 	g_return_val_if_fail (GIGGLE_IS_AVATAR_IMAGE (image), NULL);
@@ -552,7 +552,7 @@ giggle_avatar_image_set_gravatar_id (GiggleAvatarImage *image,
 	g_object_set (image, "gravatar-id", id, NULL);
 }
 
-G_CONST_RETURN char *
+const char *
 giggle_avatar_image_get_gravatar_id (GiggleAvatarImage *image)
 {
 	g_return_val_if_fail (GIGGLE_IS_AVATAR_IMAGE (image), NULL);
diff --git a/src/giggle-avatar-image.h b/src/giggle-avatar-image.h
index 074f4f8..d29a1b3 100644
--- a/src/giggle-avatar-image.h
+++ b/src/giggle-avatar-image.h
@@ -66,12 +66,12 @@ unsigned              giggle_avatar_image_get_image_size  (GiggleAvatarImage *im
 void                  giggle_avatar_image_set_image_uri   (GiggleAvatarImage *image,
 							   const char        *uri);
 
-G_CONST_RETURN char * giggle_avatar_image_get_image_uri   (GiggleAvatarImage *image);
+const char *          giggle_avatar_image_get_image_uri   (GiggleAvatarImage *image);
 
 void                  giggle_avatar_image_set_gravatar_id (GiggleAvatarImage *image,
 							   const char        *id);
 
-G_CONST_RETURN char * giggle_avatar_image_get_gravatar_id (GiggleAvatarImage *image);
+const char *          giggle_avatar_image_get_gravatar_id (GiggleAvatarImage *image);
 
 G_END_DECLS
 
diff --git a/src/giggle-input-dialog.c b/src/giggle-input-dialog.c
index fe9b590..cb76693 100644
--- a/src/giggle-input-dialog.c
+++ b/src/giggle-input-dialog.c
@@ -213,7 +213,7 @@ giggle_input_dialog_new (const gchar *text)
 			     NULL);
 }
 
-G_CONST_RETURN gchar*
+const gchar*
 giggle_input_dialog_get_text (GiggleInputDialog *input_dialog)
 {
 	GiggleInputDialogPriv *priv;
diff --git a/src/giggle-input-dialog.h b/src/giggle-input-dialog.h
index 9719bce..169dfc8 100644
--- a/src/giggle-input-dialog.h
+++ b/src/giggle-input-dialog.h
@@ -47,7 +47,7 @@ struct _GiggleInputDialogClass {
 GType                  giggle_input_dialog_get_type  (void);
 GtkWidget *            giggle_input_dialog_new       (const gchar *text);
 
-G_CONST_RETURN gchar * giggle_input_dialog_get_text  (GiggleInputDialog *input_dialog);
+const gchar *          giggle_input_dialog_get_text  (GiggleInputDialog *input_dialog);
 
 
 G_END_DECLS



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