diff -up ./gtksourceview/gtksourcelanguagemanager.c.constfix ./gtksourceview/gtksourcelanguagemanager.c
--- ./gtksourceview/gtksourcelanguagemanager.c.constfix	2011-07-10 07:51:38.499353605 +0000
+++ ./gtksourceview/gtksourcelanguagemanager.c	2011-07-10 07:51:38.506354200 +0000
@@ -274,7 +274,7 @@ gtk_source_language_manager_set_search_p
  * containg a list of language files directories.
  * The array is owned by @lm and must not be modified.
  */
-G_CONST_RETURN gchar* G_CONST_RETURN *
+const gchar* const *
 gtk_source_language_manager_get_search_path (GtkSourceLanguageManager *lm)
 {
 	g_return_val_if_fail (GTK_IS_SOURCE_LANGUAGE_MANAGER (lm), NULL);
@@ -392,7 +392,7 @@ ensure_languages (GtkSourceLanguageManag
  * available languages or %NULL if no language is available. The array
  * is owned by @lm and must not be modified.
  */
-G_CONST_RETURN gchar* G_CONST_RETURN *
+const gchar* const *
 gtk_source_language_manager_get_language_ids (GtkSourceLanguageManager *lm)
 {
 	g_return_val_if_fail (GTK_IS_SOURCE_LANGUAGE_MANAGER (lm), NULL);
diff -up ./gtksourceview/gtksourcelanguagemanager.h.constfix ./gtksourceview/gtksourcelanguagemanager.h
--- ./gtksourceview/gtksourcelanguagemanager.h.constfix	2011-07-10 07:51:38.544357434 +0000
+++ ./gtksourceview/gtksourcelanguagemanager.h	2011-07-10 07:51:38.548357774 +0000
@@ -62,13 +62,13 @@ GtkSourceLanguageManager *gtk_source_lan
 
 GtkSourceLanguageManager *gtk_source_language_manager_get_default		(void);
 
-G_CONST_RETURN gchar* G_CONST_RETURN *
+const gchar* const *
 			  gtk_source_language_manager_get_search_path		(GtkSourceLanguageManager *lm);
 
 void			  gtk_source_language_manager_set_search_path		(GtkSourceLanguageManager *lm,
 										 gchar                   **dirs);
 
-G_CONST_RETURN gchar* G_CONST_RETURN *
+const gchar* const *
 			  gtk_source_language_manager_get_language_ids		(GtkSourceLanguageManager *lm);
 
 GtkSourceLanguage	 *gtk_source_language_manager_get_language		(GtkSourceLanguageManager *lm,
diff -up ./gtksourceview/gtksourcestylescheme.c.constfix ./gtksourceview/gtksourcestylescheme.c
--- ./gtksourceview/gtksourcestylescheme.c.constfix	2011-07-10 07:51:38.518355222 +0000
+++ ./gtksourceview/gtksourcestylescheme.c	2011-07-10 07:51:38.529356157 +0000
@@ -310,7 +310,7 @@ gtk_source_style_scheme_get_description
  *
  * Since: 2.0
  */
-G_CONST_RETURN gchar* G_CONST_RETURN *
+const gchar* const *
 gtk_source_style_scheme_get_authors (GtkSourceStyleScheme *scheme)
 {
 	g_return_val_if_fail (GTK_IS_SOURCE_STYLE_SCHEME (scheme), NULL);
@@ -318,7 +318,7 @@ gtk_source_style_scheme_get_authors (Gtk
 	if (scheme->priv->authors == NULL)
 		return NULL;
 
-	return (G_CONST_RETURN gchar* G_CONST_RETURN *)scheme->priv->authors->pdata;
+	return (const gchar* const *)scheme->priv->authors->pdata;
 }
 
 /**
diff -up ./gtksourceview/gtksourcestylescheme.h.constfix ./gtksourceview/gtksourcestylescheme.h
--- ./gtksourceview/gtksourcestylescheme.h.constfix	2011-07-10 07:51:38.532356412 +0000
+++ ./gtksourceview/gtksourcestylescheme.h	2011-07-10 07:51:38.535356669 +0000
@@ -61,7 +61,7 @@ const gchar             *gtk_source_styl
 const gchar             *gtk_source_style_scheme_get_name       (GtkSourceStyleScheme *scheme);
 const gchar             *gtk_source_style_scheme_get_description(GtkSourceStyleScheme *scheme);
 
-G_CONST_RETURN gchar* G_CONST_RETURN *
+const gchar* const *
 			 gtk_source_style_scheme_get_authors	(GtkSourceStyleScheme *scheme);
 
 const gchar             *gtk_source_style_scheme_get_filename	(GtkSourceStyleScheme *scheme);
diff -up ./gtksourceview/gtksourcestyleschememanager.c.constfix ./gtksourceview/gtksourcestyleschememanager.c
--- ./gtksourceview/gtksourcestyleschememanager.c.constfix	2011-07-10 07:51:38.509354457 +0000
+++ ./gtksourceview/gtksourcestyleschememanager.c	2011-07-10 07:51:38.515354967 +0000
@@ -515,7 +515,7 @@ gtk_source_style_scheme_manager_prepend_
  * of string containing the search path.
  * The array is owned by the @manager and must not be modified.
  */
-G_CONST_RETURN gchar* G_CONST_RETURN *
+const gchar* const *
 gtk_source_style_scheme_manager_get_search_path (GtkSourceStyleSchemeManager *manager)
 {
 	g_return_val_if_fail (GTK_IS_SOURCE_STYLE_SCHEME_MANAGER (manager), NULL);
@@ -554,7 +554,7 @@ gtk_source_style_scheme_manager_force_re
  * of string containing the ids of the available style schemes or %NULL if no
  * style scheme is available. The array is owned by the @manager and must not be modified.
  */
-G_CONST_RETURN gchar* G_CONST_RETURN *
+const gchar* const *
 gtk_source_style_scheme_manager_get_scheme_ids (GtkSourceStyleSchemeManager *manager)
 {
 	g_return_val_if_fail (GTK_IS_SOURCE_STYLE_SCHEME_MANAGER (manager), NULL);
diff -up ./gtksourceview/gtksourcestyleschememanager.h.constfix ./gtksourceview/gtksourcestyleschememanager.h
--- ./gtksourceview/gtksourcestyleschememanager.h.constfix	2011-07-10 07:51:38.538356924 +0000
+++ ./gtksourceview/gtksourcestyleschememanager.h	2011-07-10 07:51:38.541357179 +0000
@@ -73,12 +73,12 @@ void 			 gtk_source_style_scheme_manager
 void 			 gtk_source_style_scheme_manager_prepend_search_path   (GtkSourceStyleSchemeManager	*manager,
 						    				 const gchar			*path);
 
-G_CONST_RETURN gchar* G_CONST_RETURN *
+const gchar* const *
 			 gtk_source_style_scheme_manager_get_search_path	(GtkSourceStyleSchemeManager	*manager);
 
 void			 gtk_source_style_scheme_manager_force_rescan		(GtkSourceStyleSchemeManager	*manager);
 
-G_CONST_RETURN gchar* G_CONST_RETURN *
+const gchar* const *
 			 gtk_source_style_scheme_manager_get_scheme_ids		(GtkSourceStyleSchemeManager	*manager);
 
 GtkSourceStyleScheme	*gtk_source_style_scheme_manager_get_scheme		(GtkSourceStyleSchemeManager	*manager,