[gthumb] removed use of the deprecated G_CONST_RETURN macro



commit 9fc0b15b0b45a6bbb4666cbc803a856b763750cb
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Sun Oct 2 11:53:51 2011 +0200

    removed use of the deprecated G_CONST_RETURN macro

 gthumb/gsignature.c                  |    2 +-
 gthumb/gsignature.h                  |    2 +-
 gthumb/gth-menu-button.c             |    6 +++---
 gthumb/gth-menu-button.h             |    6 +++---
 gthumb/gth-toggle-menu-tool-button.c |    6 +++---
 gthumb/gth-toggle-menu-tool-button.h |    6 +++---
 6 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/gthumb/gsignature.c b/gthumb/gsignature.c
index c7c957f..12b3eb1 100644
--- a/gthumb/gsignature.c
+++ b/gthumb/gsignature.c
@@ -141,7 +141,7 @@ g_signature_update (GSignature   *signature,
 }
 
 
-G_CONST_RETURN gchar *
+const gchar *
 g_signature_get_string (GSignature *signature)
 {
 	guint8 *internal_digest;
diff --git a/gthumb/gsignature.h b/gthumb/gsignature.h
index e836c3c..ae70a65 100644
--- a/gthumb/gsignature.h
+++ b/gthumb/gsignature.h
@@ -41,7 +41,7 @@ void                   g_signature_reset       (GSignature       *signature);
 void                   g_signature_update      (GSignature       *signature,
                                                 const guchar     *data,
                                                 gssize            length);
-G_CONST_RETURN gchar * g_signature_get_string  (GSignature       *signature);
+const gchar *          g_signature_get_string  (GSignature       *signature);
 void                   g_signature_get_value   (GSignature       *signature,
 						guint8           *buffer,
 						gsize            *buffer_len);
diff --git a/gthumb/gth-menu-button.c b/gthumb/gth-menu-button.c
index 3bf8d28..924ec93 100644
--- a/gthumb/gth-menu-button.c
+++ b/gthumb/gth-menu-button.c
@@ -453,7 +453,7 @@ gth_menu_button_set_label (GthMenuButton *self,
 }
 
 
-G_CONST_RETURN char *
+const char *
 gth_menu_button_get_label (GthMenuButton *self)
 {
 	g_return_val_if_fail (GTH_IS_MENU_BUTTON (self), NULL);
@@ -504,7 +504,7 @@ gth_menu_button_set_stock_id (GthMenuButton *self,
 }
 
 
-G_CONST_RETURN char *
+const char *
 gth_menu_button_get_stock_id (GthMenuButton *self)
 {
 	char *stock_id;
@@ -530,7 +530,7 @@ gth_menu_button_set_icon_name (GthMenuButton *self,
 }
 
 
-G_CONST_RETURN char *
+const char *
 gth_menu_button_get_icon_name (GthMenuButton *self)
 {
 	const char *icon_name;
diff --git a/gthumb/gth-menu-button.h b/gthumb/gth-menu-button.h
index 132bc0f..9ae199a 100644
--- a/gthumb/gth-menu-button.h
+++ b/gthumb/gth-menu-button.h
@@ -58,16 +58,16 @@ GtkWidget *             gth_menu_button_new               (void);
 GtkWidget *             gth_menu_button_new_from_stock    (const char    *stock_id);
 void                    gth_menu_button_set_label         (GthMenuButton *button,
 							   const char    *label);
-G_CONST_RETURN char *   gth_menu_button_get_label         (GthMenuButton *button);
+const char *            gth_menu_button_get_label         (GthMenuButton *button);
 void                    gth_menu_button_set_use_underline (GthMenuButton *button,
 							   gboolean       use_underline);
 gboolean                gth_menu_button_get_use_underline (GthMenuButton *button);
 void                    gth_menu_button_set_stock_id      (GthMenuButton *button,
 							   const char    *stock_id);
-G_CONST_RETURN char *   gth_menu_button_get_stock_id      (GthMenuButton *button);
+const char *            gth_menu_button_get_stock_id      (GthMenuButton *button);
 void                    gth_menu_button_set_icon_name     (GthMenuButton *button,
 							   const char    *icon_name);
-G_CONST_RETURN char *   gth_menu_button_get_icon_name     (GthMenuButton *button);
+const char *            gth_menu_button_get_icon_name     (GthMenuButton *button);
 void                    gth_menu_button_set_menu          (GthMenuButton *button,
 							   GtkWidget     *menu);
 GtkWidget *             gth_menu_button_get_menu          (GthMenuButton *button);
diff --git a/gthumb/gth-toggle-menu-tool-button.c b/gthumb/gth-toggle-menu-tool-button.c
index 1bac796..3445ccf 100644
--- a/gthumb/gth-toggle-menu-tool-button.c
+++ b/gthumb/gth-toggle-menu-tool-button.c
@@ -918,7 +918,7 @@ gth_toggle_menu_tool_button_set_label (GthToggleMenuToolButton *button,
 }
 
 
-G_CONST_RETURN char *
+const char *
 gth_toggle_menu_tool_button_get_label (GthToggleMenuToolButton *button)
 {
 	g_return_val_if_fail (GTH_IS_TOGGLE_MENU_TOOL_BUTTON (button), NULL);
@@ -964,7 +964,7 @@ gth_toggle_menu_tool_button_set_stock_id (GthToggleMenuToolButton *button,
 }
 
 
-G_CONST_RETURN char *
+const char *
 gth_toggle_menu_tool_button_get_stock_id (GthToggleMenuToolButton *button)
 {
 	g_return_val_if_fail (GTH_IS_TOGGLE_MENU_TOOL_BUTTON (button), NULL);
@@ -986,7 +986,7 @@ gth_toggle_menu_tool_button_set_icon_name (GthToggleMenuToolButton *button,
 }
 
 
-G_CONST_RETURN char*
+const char*
 gth_toggle_menu_tool_button_get_icon_name (GthToggleMenuToolButton *button)
 {
 	g_return_val_if_fail (GTH_IS_TOGGLE_MENU_TOOL_BUTTON (button), NULL);
diff --git a/gthumb/gth-toggle-menu-tool-button.h b/gthumb/gth-toggle-menu-tool-button.h
index 47665e1..7e23e3f 100644
--- a/gthumb/gth-toggle-menu-tool-button.h
+++ b/gthumb/gth-toggle-menu-tool-button.h
@@ -58,16 +58,16 @@ GtkToolItem *           gth_toggle_menu_tool_button_new               (void);
 GtkToolItem *           gth_toggle_menu_tool_button_new_from_stock    (const char              *stock_id);
 void                    gth_toggle_menu_tool_button_set_label         (GthToggleMenuToolButton *button,
 								       const char              *label);
-G_CONST_RETURN char *   gth_toggle_menu_tool_button_get_label         (GthToggleMenuToolButton *button);
+const char *            gth_toggle_menu_tool_button_get_label         (GthToggleMenuToolButton *button);
 void                    gth_toggle_menu_tool_button_set_use_underline (GthToggleMenuToolButton *button,
 								       gboolean                 use_underline);
 gboolean                gth_toggle_menu_tool_button_get_use_underline (GthToggleMenuToolButton *button);
 void                    gth_toggle_menu_tool_button_set_stock_id      (GthToggleMenuToolButton *button,
 								       const char              *stock_id);
-G_CONST_RETURN char *   gth_toggle_menu_tool_button_get_stock_id      (GthToggleMenuToolButton *button);
+const char *            gth_toggle_menu_tool_button_get_stock_id      (GthToggleMenuToolButton *button);
 void                    gth_toggle_menu_tool_button_set_icon_name     (GthToggleMenuToolButton *button,
 								       const char              *icon_name);
-G_CONST_RETURN char *   gth_toggle_menu_tool_button_get_icon_name     (GthToggleMenuToolButton *button);
+const char *            gth_toggle_menu_tool_button_get_icon_name     (GthToggleMenuToolButton *button);
 void                    gth_toggle_menu_tool_button_set_active        (GthToggleMenuToolButton *button,
 								       gboolean                 is_active);
 gboolean                gth_toggle_menu_tool_button_get_active        (GthToggleMenuToolButton *button);



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