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

diff --combined libchimara/resource.c
index 457a925d06ea768e2b579e650a55a673da4cc433,abf0fc389c971ca8f19aa27c6c3ac53362c19741..ba47dd41dff43137c9c319c99b7e60c2c367a48a
--- 1/libchimara/resource.c
--- 2/libchimara/resource.c
+++ b/libchimara/resource.c
@@@ -1,5 -1,4 +1,5 @@@
  #include "resource.h"
 +#include "stream.h"
  
  extern GPrivate *glk_data_key;
  
@@@ -39,6 -38,7 +39,6 @@@ giblorb_set_resource_map(strid_t file
        glk_data->resource_map = newmap;
        glk_data->resource_file = file;
  
 -      //giblorb_print_contents(newmap);
        return giblorb_err_None;
  }
  
@@@ -114,7 -114,7 +114,7 @@@ giblorb_print_contents(giblorb_map_t *m
        }       
  }
  
- gchar*
+ const char *
  giblorb_get_error_message(giblorb_err_t err)
  {
        switch(err)