From ed9db7c3e5c7985f19cc2e43a6e67b3fc19c8357 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Thu, 16 Jun 2011 00:51:17 +0100 Subject: [PATCH] Use 'const' instead G_CONST_RETURN --- docs/reference/gtk/question_index.sgml | 4 ++-- gdk/directfb/gdkdisplay-directfb.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/reference/gtk/question_index.sgml b/docs/reference/gtk/question_index.sgml index 771e7c94cb..652550901a 100644 --- a/docs/reference/gtk/question_index.sgml +++ b/docs/reference/gtk/question_index.sgml @@ -107,8 +107,8 @@ of #GObject so the same points apply, except that it has a "floating" state -For strings returned from functions, they will be declared "const" (using -#G_CONST_RETURN) if they should not be freed. Non-const strings should be +For strings returned from functions, they will be declared "const" +if they should not be freed. Non-const strings should be freed with g_free(). Arrays follow the same rule. (If you find an exception to the rules, please report a bug to http://bugzilla.gnome.org.) diff --git a/gdk/directfb/gdkdisplay-directfb.c b/gdk/directfb/gdkdisplay-directfb.c index 4db63e91b6..d4dfbef003 100644 --- a/gdk/directfb/gdkdisplay-directfb.c +++ b/gdk/directfb/gdkdisplay-directfb.c @@ -193,7 +193,7 @@ _gdk_windowing_set_default_display (GdkDisplay *display) _gdk_display = GDK_DISPLAY_DFB (display); } -G_CONST_RETURN gchar * +const gchar * gdk_display_get_name (GdkDisplay *display) { return gdk_get_display_arg_name ();