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

diff --git a/libchimara/resource.c b/libchimara/resource.c
index 457a925d06ea768e2b579e650a55a673da4cc433..ba47dd41dff43137c9c319c99b7e60c2c367a48a 100644 (file)
--- 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 a7325416e5ee1efb90327fe41d4d361fa31c9789..6f5b70d3bda6ea063548debd7dd8a7c7ed455081 100644 (file)
--- 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