From: Marijn van Vliet <w.m.vanvliet@gmail.com>
Date: Sat, 15 Sep 2012 23:05:44 +0000 (+0200)
Subject: Merge branch 'gtk3' of ssh://git.stderr.nl/projects/chimara/chimara into gtk3
X-Git-Tag: v0.9~8
X-Git-Url: https://git.stderr.nl/gitweb?p=projects%2Fchimara%2Fchimara.git;a=commitdiff_plain;h=bb6ef9669d8f9ba58c52e1cadae9b7b303d5bc70;hp=f17f704eb40ce5d3d6ec7f2daf2d67586225ff90

Merge branch 'gtk3' of ssh://git.stderr.nl/projects/chimara/chimara into gtk3
---

diff --git a/libchimara/resource.c b/libchimara/resource.c
index 457a925..ba47dd4 100644
--- a/libchimara/resource.c
+++ b/libchimara/resource.c
@@ -114,7 +114,7 @@ giblorb_print_contents(giblorb_map_t *map)
 	}	
 }
 
-gchar*
+const char *
 giblorb_get_error_message(giblorb_err_t err)
 {
 	switch(err)
diff --git a/libchimara/resource.h b/libchimara/resource.h
index a732541..6f5b70d 100644
--- a/libchimara/resource.h
+++ b/libchimara/resource.h
@@ -8,6 +8,6 @@
 #include "magic.h"
 
 void giblorb_print_contents(giblorb_map_t *map);
-gchar* giblorb_get_error_message(giblorb_err_t err);
+const char * giblorb_get_error_message(giblorb_err_t err);
 
 #endif