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?a=commitdiff_plain;h=bb6ef9669d8f9ba58c52e1cadae9b7b303d5bc70;hp=-c;p=projects%2Fchimara%2Fchimara.git

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

bb6ef9669d8f9ba58c52e1cadae9b7b303d5bc70
diff --combined libchimara/resource.c
index 457a925,abf0fc3..ba47dd4
--- a/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)