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
 </para>
 
 <para>
-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 <ulink 
 url="http://bugzilla.gnome.org">http://bugzilla.gnome.org</ulink>.)
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 ();