X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fresource.c;h=49ef35280a369daf60aeecdf6279c81fd3cf5f58;hb=0c5e51127206d26290a8e1e1349ab37d847d1d84;hp=9c40723057393c32f885365cff9dab2baa4dc6a1;hpb=6a5f37b58f4e1b7ff1063864eded5661b080b2e5;p=projects%2Fchimara%2Fchimara.git

diff --git a/libchimara/resource.c b/libchimara/resource.c
index 9c40723..49ef352 100644
--- a/libchimara/resource.c
+++ b/libchimara/resource.c
@@ -1,6 +1,7 @@
 #include "resource.h"
+#include "stream.h"
 
-extern GPrivate *glk_data_key;
+extern GPrivate glk_data_key;
 
 /**
  * giblorb_set_resource_map:
@@ -19,7 +20,7 @@ extern GPrivate *glk_data_key;
 giblorb_err_t
 giblorb_set_resource_map(strid_t file)
 {
-	ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
+	ChimaraGlkPrivate *glk_data = g_private_get(&glk_data_key);
 	giblorb_map_t *newmap; /* create map allocates memory */
 	giblorb_err_t error = giblorb_create_map(file, &newmap);
 
@@ -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;
 }
 
@@ -53,8 +53,8 @@ giblorb_set_resource_map(strid_t file)
 giblorb_map_t*
 giblorb_get_resource_map()
 {
-	ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
-	
+	ChimaraGlkPrivate *glk_data = g_private_get(&glk_data_key);
+
 	if(glk_data->resource_map == NULL) {
 		WARNING("Resource map not set yet.\n");
 	}
@@ -114,7 +114,7 @@ giblorb_print_contents(giblorb_map_t *map)
 	}	
 }
 
-gchar*
+const char *
 giblorb_get_error_message(giblorb_err_t err)
 {
 	switch(err)