X-Git-Url: https://git.stderr.nl/gitweb?p=projects%2Fchimara%2Fchimara.git;a=blobdiff_plain;f=libchimara%2Fglkunix.c;h=bdadbafca72b48f9bfff88fcbb0d2d5c537217f7;hp=ddaf84806c2bed15a65252bab4e9a83c0d4f0164;hb=1e0dc5378f314f555e3b923c6d95f5017abd528b;hpb=b52bdc5cb7ecd5674a3f40cdd50de615289a583e diff --git a/libchimara/glkunix.c b/libchimara/glkunix.c index ddaf848..bdadbaf 100644 --- a/libchimara/glkunix.c +++ b/libchimara/glkunix.c @@ -7,7 +7,7 @@ #include "fileref.h" #include "stream.h" -extern GPrivate *glk_data_key; +extern GPrivate glk_data_key; /** * glkunix_stream_open_pathname_gen: @@ -27,7 +27,7 @@ extern GPrivate *glk_data_key; strid_t glkunix_stream_open_pathname_gen(char *pathname, glui32 writemode, glui32 textmode, glui32 rock) { - ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); + ChimaraGlkPrivate *glk_data = g_private_get(&glk_data_key); if(!glk_data->in_startup) ILLEGAL("glkunix_stream_open_pathname_gen() may only be called from " @@ -58,7 +58,7 @@ glkunix_stream_open_pathname_gen(char *pathname, glui32 writemode, glui32 textmo strid_t glkunix_stream_open_pathname(char *pathname, glui32 textmode, glui32 rock) { - ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); + ChimaraGlkPrivate *glk_data = g_private_get(&glk_data_key); if(!glk_data->in_startup) ILLEGAL("glkunix_stream_open_pathname() may only be called from " @@ -89,8 +89,8 @@ glkunix_set_base_file(char *filename) g_return_if_fail(filename); g_return_if_fail(strlen(filename) > 0); - ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); - + ChimaraGlkPrivate *glk_data = g_private_get(&glk_data_key); + gchar *dirname = g_path_get_dirname(filename); if(!g_file_test(dirname, G_FILE_TEST_IS_DIR)) {