X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fresource.c;h=49ef35280a369daf60aeecdf6279c81fd3cf5f58;hb=fabc4f9b35b4d4e1bb3c3f67971e8e134889c453;hp=abf0fc389c971ca8f19aa27c6c3ac53362c19741;hpb=77fe88af15dc59b5595822f70d75082f1ccd34a4;p=projects%2Fchimara%2Fchimara.git

diff --git a/libchimara/resource.c b/libchimara/resource.c
index abf0fc3..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");
 	}