[nautilus] libnautilus-private: Use 'const' instead G_CONST_RETURN
- From: Javier Jardón <jjardon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus] libnautilus-private: Use 'const' instead G_CONST_RETURN
- Date: Thu, 9 Jun 2011 16:57:25 +0000 (UTC)
commit f657a12a9f1da481e7a580335b682749ac4b01cf
Author: Javier Jardón <jjardon gnome org>
Date: Thu Jun 9 17:34:00 2011 +0100
libnautilus-private: Use 'const' instead G_CONST_RETURN
libnautilus-private/nautilus-icon-canvas-item.c | 6 +++---
libnautilus-private/nautilus-icon-info.c | 4 ++--
libnautilus-private/nautilus-icon-info.h | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/libnautilus-private/nautilus-icon-canvas-item.c b/libnautilus-private/nautilus-icon-canvas-item.c
index 673b673..c94bb0c 100644
--- a/libnautilus-private/nautilus-icon-canvas-item.c
+++ b/libnautilus-private/nautilus-icon-canvas-item.c
@@ -2490,7 +2490,7 @@ nautilus_icon_canvas_item_accessible_action_interface_init (AtkActionIface *ifac
iface->set_description = nautilus_icon_canvas_item_accessible_action_set_description;
}
-static G_CONST_RETURN gchar *
+static const gchar *
nautilus_icon_canvas_item_accessible_get_name (AtkObject *accessible)
{
NautilusIconCanvasItem *item;
@@ -2506,7 +2506,7 @@ nautilus_icon_canvas_item_accessible_get_name (AtkObject *accessible)
return item->details->editable_text;
}
-static G_CONST_RETURN gchar*
+static const gchar*
nautilus_icon_canvas_item_accessible_get_description (AtkObject *accessible)
{
NautilusIconCanvasItem *item;
@@ -2564,7 +2564,7 @@ nautilus_icon_canvas_item_accessible_get_index_in_parent (AtkObject *accessible)
return -1;
}
-static G_CONST_RETURN gchar *
+static const gchar *
nautilus_icon_canvas_item_accessible_get_image_description (AtkImage *image)
{
NautilusIconCanvasItemAccessiblePrivate *priv;
diff --git a/libnautilus-private/nautilus-icon-info.c b/libnautilus-private/nautilus-icon-info.c
index c99564e..52fc561 100644
--- a/libnautilus-private/nautilus-icon-info.c
+++ b/libnautilus-private/nautilus-icon-info.c
@@ -587,13 +587,13 @@ nautilus_icon_info_get_attach_points (NautilusIconInfo *icon,
return icon->n_attach_points != 0;
}
-G_CONST_RETURN char *
+const char *
nautilus_icon_info_get_display_name (NautilusIconInfo *icon)
{
return icon->display_name;
}
-G_CONST_RETURN char *
+const char *
nautilus_icon_info_get_used_name (NautilusIconInfo *icon)
{
return icon->icon_name;
diff --git a/libnautilus-private/nautilus-icon-info.h b/libnautilus-private/nautilus-icon-info.h
index 3ef41c6..924918c 100644
--- a/libnautilus-private/nautilus-icon-info.h
+++ b/libnautilus-private/nautilus-icon-info.h
@@ -72,8 +72,8 @@ gboolean nautilus_icon_info_get_embedded_rect (NautilusI
gboolean nautilus_icon_info_get_attach_points (NautilusIconInfo *icon,
GdkPoint **points,
gint *n_points);
-G_CONST_RETURN char *nautilus_icon_info_get_display_name (NautilusIconInfo *icon);
-G_CONST_RETURN char *nautilus_icon_info_get_used_name (NautilusIconInfo *icon);
+const char * nautilus_icon_info_get_display_name (NautilusIconInfo *icon);
+const char * nautilus_icon_info_get_used_name (NautilusIconInfo *icon);
void nautilus_icon_info_clear_caches (void);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]